Fix some tests.