[BACKLOG-179] Fixing/Updating unit tests
Merge pull request #764 from mdamour1976/master

[BACKLOG-179] Fixing/Updating unit tests