refactored features and step definitions