Fix tests and run tests on PR for 3.4#41

kaitlinnewson merged 2 commits intopkp:stable-3_4_0pkp/customHeader:stable-3_4_0from

kaitlinnewson:tests-3_4_0kaitlinnewson/customHeader:tests-3_4_0Copy head branch name to clipboard