Added tests for OptionService