Added test and descriptor for options