Merge pull request #422 from pberde/master

Fix unit test issues