Cleaned up UserGroup logic, made more tests pass.