Browser testing amendments and polyfills
Merge branch 'browser-testing' into dev