Fixed one test.  Adjusted some formatting for consistancy.
Changed to consistent (x,y) coordinates.