#576 Fixed broken test: added OptionService