test: Generalize with-term

[abhinav]

Fixes a flaky test in commit_split while at it.

[abhinav]

This change is part of the following stack:

• test: Generalize midterm-based EmulatorView #529
  • test: Generalize with-term #533 ◀

_{Change managed by git-spice.}