Fixed bug with zone entry struct.  Adding more tests and coverage.