Fix unit test failures on Jenkins
Merge pull request #42 from chuckdumont/master

Jenkins unit test failures