Merge "Fix gtests."