Merge pull request #830 from narfbg/develop-unit-test

Improve the Unit test library