Change ProjectModel to use MapOfProjectRoleModel.  Tests fixed and passing.