fix various behat
fix unit tests