More test fixups for new Emit interface