Jaya|Added tests for change password
resolved merge conflicts