Renamed deployment.eiq to deploymentQueries.eiq (to avoid name
collision)
Modify tests
Replaced IncQueryBase to pattern