Fix test expect progress fixed master

Still waiting for CI, but as usual I'm optimistic and not expecting any problems.

The commits might seem unrelated but together they (the first 2) fix the failing test_expect_progress_fixed_master test.

Will post an update when CI has finished.