Modified feature and step definitions