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