Fix: unit test regression fix
Merge pull request #216 from tmughal/master

Fix: unit test regression fix