Modified a few unit tests, fixed password bug
Merge branch 'master' of https://github.com/pemami4911/Osprey

:wq