GTEST dir still used improperly in some places