few more fixes for gtest