Addition of UserModelTest, related fixes to UserModel class based upon
decisions made during test development. Additional changes to
UserGroupModelTest to reflect the same decisions, again with related
fixes to UserGroupModel class.