Sutle gtest changes that need to be completed.