Finished Password Resets, and made tests easier to read