fixing CQL tests in IntraServiceITest

Also adding back logic in CqlQueryHandler for not transposing query results.