Style changes. Rewording scenarios to match step def changes.