Hopefully fixed any Jenkins hang-up when performing the unit tests
Merge pull request #15 from cafarm/unit-tests

Hopefully fixed any Jenkins hang-up when performing the unit tests