Merge with Person and also add manager test