Refactoring features and step definitions