various minor changes to use the latest version of the test framework
Merge pull request #5161 from guardian/test-automation-webdriver-factory-refactor

various minor changes to use the latest version of the test framework