Fixing tests for good!