more test fixups