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

[BACKLOG-290] Fixed unit tests