Renamed test files, worked on User and UserGroup models