Make several improvements in feature files and step definitions