Improving Behat.

#6763
This is the branch where all the changes will be made against.