Merge "Migrate query tests to integration-test module #2"