[BACKLOG-290] Fixed unit tests
Merge pull request #534 from e-cuellar/master

[BACKLOG-290] Fixed unit tests