added change password tests
Merge branch 'reset-password'