Minor refactoring into Behat Contexts