Tweaks to gtest