Update Users controller, matches action + add more tests to Users controller.
Fix controller test.