Refactor behat tests