Fixup more of the Googletest integration