Fix XY <=> zone method and testcase