Merge pull request #166 from shilad/spatial

Spatial
Merge pull request #167 from shilad/spatial

Spatial
Fix bug in order of tests.