Initial fix of tests.