simpler test fixups