Fix behat context & fixtures after latest merges