Re-ordering the feature file and adding steps