Feature file edits ready for 1.6 Regression testing