more password reset tests and controllers, and a bunch of copy and paste fixes