Some cleanup and a minor change to the UsersControllerTest.php