Fix/glog gtest fixing

Changes reflecting current approach in other 3rd party packages (e.g. glog/gflags)