Fix the behat sentances

Instead of

``` cucumber
Given I execute the command
Then the command should not fail
And I save the session
```

should be

``` cucmber
When I execute the command ..
Then the command should not fail
And I save the session
Then ...
```

So replace `Given` with `When` and make the 
