some test fixups