ZoneTrackerTest completed and refactored