added reset password rest tests
merged conflicts