Fixed remaining tests
Fixed spatial.