More test fixups after TimToady++'s work