Added specs (and fixes) for password resets
Adds specs for activation