Refactored cql execution tests to be more modular