Fixing tests, fixes #5