Merge branch 'pb/test-parse-options-expect'

Test clean-up. * pb/test-parse-options-expect: t0040: convert all possible tests to use `test-parse-options --expect`