Fixed Cucumber step definitions