Finished fixing Google tests.