Fix cross-jump NOP insertions
Fix test automation