Fix up tests, still some failures.