Fix QueryApiSpec.
Fixing ProductCrudIntegrationTest.
Fixing ProductTypeIntegrationTest.