Adjusting options and operators implementations, adding new options test cases.