Sort the FieldValues appropriately but not had chance to update all the tests so some are failing