Fix some Behat tests
Merge pull request #125 from eko/behat

Fix some Behat tests