Fix Behat tests

I've one of the two Behat tests failing for sure but I'm not really sure that the second will be fixed with this.