Person Service Tests & tidy up