Fixing tests

Fixes #7