Merge "Add Query Spec to integration-test package"