Refactor Authy and UserController
Fix usercontroller test