Fix: Unit test failure fixes
Merge pull request #249 from tmughal/master

Fix: Unit test failure fixes