Cleaning up ColumnCountQueryTests - this includes tests for column count queries with single rows and also multiple rows