Hopefully the last of Jenkins unit test problems
Merge pull request #16 from cafarm/more-unit-tests

Hopefully the last of Jenkins unit test problems