Additional fixups to tests