Small fixes
Behat's scenario improvement