diff --git a/sdf/test/cpp/TestSdf.cc b/sdf/test/cpp/TestSdf.cc
index 9b0f8e1e..fc4e4b72 100644
--- a/sdf/test/cpp/TestSdf.cc
+++ b/sdf/test/cpp/TestSdf.cc
@@ -1599,7 +1599,7 @@ TEST_F(SdfDesignTest, ReadSdfPeriod) {
 
 // R11_8: Read SDF with NOCHANGE check
 // Covers: SdfReader::timingCheckNochange, notSupported
-// NOCHANGE is not supported and throws, so we catch the exception
+// NOCHANGE is not supported and issues a warning (no longer throws)
 TEST_F(SdfDesignTest, ReadSdfNochange) {
   ASSERT_TRUE(design_loaded_);
   sta_->ensureGraph();
@@ -1626,11 +1626,10 @@ TEST_F(SdfDesignTest, ReadSdfNochange) {
   fprintf(fp, ")\n");
   fclose(fp);
 
-  // NOCHANGE is not supported and throws an exception
-  EXPECT_THROW(
+  // NOCHANGE is not supported; upstream now warns instead of throwing
+  EXPECT_NO_THROW(
     readSdf(sdf_path, "", corner, false, false,
-            const_cast<MinMaxAll*>(MinMaxAll::all()), sta_),
-    std::exception
+            const_cast<MinMaxAll*>(MinMaxAll::all()), sta_)
   );
 
   std::remove(sdf_path);
diff --git a/search/test/cpp/TestSearchClasses.cc b/search/test/cpp/TestSearchClasses.cc
index 5ead6736..9a2fa983 100644
--- a/search/test/cpp/TestSearchClasses.cc
+++ b/search/test/cpp/TestSearchClasses.cc
@@ -168,7 +168,7 @@ TEST_F(PropertyValueTest, DefaultConstructor) {
 }
 
 TEST_F(PropertyValueTest, StringConstructor) {
-  PropertyValue pv("hello");
+  PropertyValue pv(std::string_view("hello"));
   EXPECT_EQ(pv.type(), PropertyValue::Type::string);
   EXPECT_EQ(pv.stringValue(), "hello");
 }
@@ -272,7 +272,7 @@ TEST_F(PropertyValueTest, NullClockConstructor) {
 }
 
 TEST_F(PropertyValueTest, CopyConstructorString) {
-  PropertyValue pv1("copy_test");
+  PropertyValue pv1(std::string_view("copy_test"));
   PropertyValue pv2(pv1);
   EXPECT_EQ(pv2.type(), PropertyValue::Type::string);
   EXPECT_EQ(pv2.stringValue(), "copy_test");
@@ -379,7 +379,7 @@ TEST_F(PropertyValueTest, CopyConstructorClock) {
 }
 
 TEST_F(PropertyValueTest, MoveConstructorString) {
-  PropertyValue pv1("move_test");
+  PropertyValue pv1(std::string_view("move_test"));
   PropertyValue pv2(std::move(pv1));
   EXPECT_EQ(pv2.type(), PropertyValue::Type::string);
   EXPECT_EQ(pv2.stringValue(), "move_test");
@@ -476,7 +476,7 @@ TEST_F(PropertyValueTest, MoveConstructorClock) {
 }
 
 TEST_F(PropertyValueTest, CopyAssignmentString) {
-  PropertyValue pv1("assign_test");
+  PropertyValue pv1(std::string_view("assign_test"));
   PropertyValue pv2;
   pv2 = pv1;
   EXPECT_EQ(pv2.type(), PropertyValue::Type::string);
@@ -501,7 +501,7 @@ TEST_F(PropertyValueTest, CopyAssignmentBool) {
 
 TEST_F(PropertyValueTest, CopyAssignmentNone) {
   PropertyValue pv1;
-  PropertyValue pv2("replace_me");
+  PropertyValue pv2(std::string_view("replace_me"));
   pv2 = pv1;
   EXPECT_EQ(pv2.type(), PropertyValue::Type::none);
 }
@@ -587,7 +587,7 @@ TEST_F(PropertyValueTest, CopyAssignmentClock) {
 }
 
 TEST_F(PropertyValueTest, MoveAssignmentString) {
-  PropertyValue pv1("move_assign");
+  PropertyValue pv1(std::string_view("move_assign"));
   PropertyValue pv2;
   pv2 = std::move(pv1);
   EXPECT_EQ(pv2.type(), PropertyValue::Type::string);
@@ -612,7 +612,7 @@ TEST_F(PropertyValueTest, MoveAssignmentBool) {
 
 TEST_F(PropertyValueTest, MoveAssignmentNone) {
   PropertyValue pv1;
-  PropertyValue pv2("stuff");
+  PropertyValue pv2(std::string_view("stuff"));
   pv2 = std::move(pv1);
   EXPECT_EQ(pv2.type(), PropertyValue::Type::none);
 }
@@ -704,12 +704,12 @@ TEST_F(PropertyValueTest, StringValueThrowsOnWrongType) {
 }
 
 TEST_F(PropertyValueTest, FloatValueThrowsOnWrongType) {
-  PropertyValue pv("not_a_float");
+  PropertyValue pv(std::string_view("not_a_float"));
   EXPECT_THROW(pv.floatValue(), Exception);
 }
 
 TEST_F(PropertyValueTest, BoolValueThrowsOnWrongType) {
-  PropertyValue pv("not_a_bool");
+  PropertyValue pv(std::string_view("not_a_bool"));
   EXPECT_THROW(pv.boolValue(), Exception);
 }
 
@@ -903,7 +903,7 @@ TEST_F(PropertyValueTest, ToStringBoolFalse) {
 
 // to_string for string values
 TEST_F(PropertyValueTest, ToStringString) {
-  PropertyValue pv("test_str");
+  PropertyValue pv(std::string_view("test_str"));
   EXPECT_EQ(pv.to_string(nullptr), "test_str");
 }