Merge "Add horizon test to smoke group" into mcp/queens