Moved most of the deserialisation tests for Locations to the deserialiser