More fixups for tests