Fix behat tests
Merge branch 'feature/fix-behat-suite'