Updating deformation model to cover EEZ
Adding separator tests, fixing up for new deformation model