Minor behat test refactoring