Cleaning up ColumnQueryTests - which takes care of different kinds of Column Slice queries