Pulled in some changes to the Behat test suite from an ongoing feature branch
Merge pull request #147 from christeredvartsen/develop

Behat features