fixing issues with parse-options and related tests