Trimmed down MatchedQueriesTests