Fix regressions in Behat Tests.