Unit tests for zone, bug fix.