Query tests and whitespace concat adjustments
Query tests and fixes
Imports and formatting
Query tests
Query tests and sanity checks