Rejig tests for handlers
Rename tests - all tests passing
Adding password reset