Remembered why migration 35 was split in to two parts...
Deleted some old code and tests.
Added some unit tests for the distance function in the grid class.
Fixed the build and added more coverage.
Added a few more tests, as well as a 'functional' test.