Condensed for-loops
Added test for zone constructor
Improved location equals accuracy