Cucumber and Stepdefinitions slightly changed