Fixing tests again