Add changes for work with GTEST.