More test fixups