Try to fix xpcshell tests with v2 signature changes. DONTBUILD