Fix for failing tests
Merge pull request #31 from mollux/fixes/testfix

Fix for failing tests