Attempt to fix tests.