Modified steps and step definitions to be less wordy