[BACKLOG-290] Fixing unit tests in master
Merge pull request #475 from mdamour1976/master

[BACKLOG-290] Fixing unit tests in master