Fix behat tests
Merge pull request #967 from tommygnr/fix-behat-tests

Fix behat tests