Change some remaining Cucumber.Options to CucumberOptions