Fix gtest (but not completely)