Finally, this should fix tests.