Initial round of tests and associated fixes
Default to storing kdtree
More matching tests and associated fixes