improved behat tests