Reduce the number of "smoke" tests

This reduces the number of smoke tests to < 10. It includes v1 tests, v2
tests and one scenario test to check that a zone goes to active.

Change-Id: I9233a5d783649fe2bfad8e772f4165bdc4e1c619
16 files changed