Merge "Split out lestener test" into mcp/antelope