more dup code removal from Zone
complete code coverage tests for Zone