merge helpers into Person and Org
combine tests