Finally really fix tests.