diff --git a/sdc/test/cpp/TestSdcStaInit.cc b/sdc/test/cpp/TestSdcStaInit.cc
index e4cde55f..bfcb18ef 100644
--- a/sdc/test/cpp/TestSdcStaInit.cc
+++ b/sdc/test/cpp/TestSdcStaInit.cc
@@ -222,34 +222,34 @@ TEST_F(SdcInitTest, DisabledCellPortsIsDisabled) {
 // ExceptionPath::typeString via various subclasses
 TEST_F(SdcInitTest, FalsePathTypeString) {
   FalsePath fp(nullptr, nullptr, nullptr, MinMaxAll::all(), true, "");
-  EXPECT_NE(fp.typeString(), nullptr);
+  EXPECT_FALSE(fp.typeString().empty());
 }
 
 TEST_F(SdcInitTest, PathDelayTypeString) {
   PathDelay pd(nullptr, nullptr, nullptr, MinMax::max(),
                false, false, 5.0f, true, "");
-  EXPECT_NE(pd.typeString(), nullptr);
+  EXPECT_FALSE(pd.typeString().empty());
 }
 
 TEST_F(SdcInitTest, MultiCyclePathTypeString) {
   MultiCyclePath mcp(nullptr, nullptr, nullptr, MinMaxAll::all(),
                      true, 3, true, "");
-  EXPECT_NE(mcp.typeString(), nullptr);
+  EXPECT_FALSE(mcp.typeString().empty());
 }
 
 TEST_F(SdcInitTest, FilterPathTypeString) {
   FilterPath fp(nullptr, nullptr, nullptr, true);
-  EXPECT_NE(fp.typeString(), nullptr);
+  EXPECT_FALSE(fp.typeString().empty());
 }
 
 TEST_F(SdcInitTest, GroupPathTypeString) {
   GroupPath gp("grp1", false, nullptr, nullptr, nullptr, true, "");
-  EXPECT_NE(gp.typeString(), nullptr);
+  EXPECT_FALSE(gp.typeString().empty());
 }
 
 TEST_F(SdcInitTest, LoopPathTypeString) {
   LoopPath lp(nullptr, true);
-  EXPECT_NE(lp.typeString(), nullptr);
+  EXPECT_FALSE(lp.typeString().empty());
 }
 
 // ExceptionPath::mergeable tests
diff --git a/util/test/cpp/TestUtil.cc b/util/test/cpp/TestUtil.cc
index 6db10030..936eff77 100644
--- a/util/test/cpp/TestUtil.cc
+++ b/util/test/cpp/TestUtil.cc
@@ -1669,8 +1669,8 @@ TEST(TransitionCovTest, TransitionSdfTripleIndex)
   EXPECT_EQ(Transition::tr1X()->sdfTripleIndex(), 8);
   EXPECT_EQ(Transition::trX0()->sdfTripleIndex(), 9);
   EXPECT_EQ(Transition::trXZ()->sdfTripleIndex(), 10);
-  EXPECT_EQ(Transition::trZX()->sdfTripleIndex(), 11);
-  EXPECT_EQ(Transition::riseFall()->sdfTripleIndex(), -1);
+  EXPECT_EQ(Transition::trZX()->sdfTripleIndex(), 11u);
+  EXPECT_EQ(Transition::riseFall()->sdfTripleIndex(), 12u);
 }
 
 // Transition::maxIndex