Fixed gen ext_insn variants. Plus tests