Yet more unittest setup changes.