Try to fix failures in the behat scenarios.

Try to fix failures in the behat scenarios.