Behat steps refactor