Fix bug and wrong test for ternary condition skips