Modify user tests and corresponding views, model, controller