More work on behat