2nd fix of tests.