Merge pull request #282 from krishnan-mani/master

Fixes #281: Unit test fails for model User