revert the revert
Merge pull request #367 from nlake44/fix-unit-test2

revert the revert