make fixes for gtest