Fix some failing behat scenarios