Moved the coordinate conversion, and updated tests and other methods accordingly