> What I would probably do is submit them together: the zone-ids fix + this > test case that helps test it. If you take out your "xyz" change, will this > test fail currently? > > If i take out the change which masks the zone-ids, this test fails on master because, zone-ids dont match before and after restart.