Merge "Adds new scenario test to the Zones suite + minor refactoring"