Actually fix tests!