Adding new test for reset password code and tidying a couple of other tests.

Signed-off-by: Ben Corlett <bencorlett@me.com>