Try to fix tests again