Working behat test and small fix