Merge pull request #295 from udp3f/master

unit test fixes for latest updates