Some behat refactoring