changes so gtest use matches what happens on master