Improve behat tests