Fix some tests
Merge pull request #717 from nestalk/master

Fix some tests that were failing