Fix up some tests.