Backport behat tests