i18n-abide requires named variables to be replaced to end with `s`
requestPasswordReset no longer takes a password.
Fix the tests! Mostly updates to function signatures and adding a couple of addresses to the mocks.