Fixing up the reset password popup and changing up tests.