Add tests for zone