Refactor behat steps