Merge pull request #297 from udp3f/master

fix unit test errors