Ensure singleton cleared between integration test runs
Switch Availability Zone for sample and integration tests, default integration tests to use sample