Clean up tests for forgot and reset password, fix bug with resetting passwords