Fixing tests, fixes #3