Behat improvements