tests(functional): more functional test hardening
Merge pull request #978 from mozilla/more-functional-test-hardening

tests(functional): more functional test hardening