Change test to delete after printing time
Add 'create another zone' test
Add multitenant support