DRY up the controllers
Add test for google oauth2 login