Updated tests
Added spatial types geometry
Updated test data