Add monitoring zones and tests

Couple fixes to support monitoring zones.