Improve user tests and controller.
Fix merge conflicts.