Merge pull request #164 from zmonteca/develop

User password edit / unit tests
updated deprecated assertEqual
Fix testEditPassword
Controller Test Fixed

All tests run with 2.4.5
Removed testTest
Merge pull request #165 from stonelasley/develop

Fixing tests