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