Improve cucumber step readability and definitions; fix the feature.