Add some helper steps in Scenarios 7, 8 and 9. Rename templates collections
Upgrade to Achilles 1.7.2