Tried another fix of the spatial correlation tests