Fix other tests.