fix type of return value of extra_options as it was before, enhance unit tests
fix remarks
Merge pull request #894 from boegel/fix_extra_options_return_type

fix type of return value of extra_options as it was before, enhance unit tests