Added new options
Added new test case