Fix behat context & fixtures after latest merges

Why we need to do this?