Changed to use struct to hold coordinates. Shown huge weakness in brittleness of tests... TBC