improve tests
Merge branch 'feature/distance-2d'