Behat improvements and bufixes