added some scenarios and reparing for behat