Finally fix tests.