Improve aggregate tests

- skip aggregate tests on production environments
- ensure host selection without instances before adding host
  to aggregate

Related-prod: PRODX-42808
Change-Id: If1e59f5b5207d6f1f07fca7fa217a516136a1391
2 files changed