Fix for some tests.