Fix behat context & fixtures after latest merges
Merge pull request #1809 from stloyd/bugfix/broken_behat

Fix behat context & fixtures after latest merges