Merge "CTS tests for queries across all genres."