Correction and extension of gtest.