Ensure vpc created in a test doesn't affect another
Merge branch 'tests-isolation' into maestrodev