diff --git a/onnxruntime/core/graph/schema_registry.cc b/onnxruntime/core/graph/schema_registry.cc
index f9c91db762..c6b817d680 100644
--- a/onnxruntime/core/graph/schema_registry.cc
+++ b/onnxruntime/core/graph/schema_registry.cc
@@ -282,8 +282,17 @@ void SchemaRegistryManager::GetSchemaAndHistory(
     checked_registry_indices.push_back(index);
   }
 
+  // reset the version to the input op_set_version in case there was an unchecked registry using the same domain.
+  // we have no control over the opset values in those registries and the version values aren't guaranteed to
+  // match the real ONNX ones.
+  // e.g. a user can add a custom registry that uses the ONNX domain. the custom op infrastructure would
+  //      create the custom registry with an opset range of 1 to 1000. the above loop that processes the unchecked
+  //      registry would find the opset range of 1 to 1000 and set `new_version` to 1, which would result in `version`
+  //      being set to 1. that would override the op_set_version value provided and result in us only ever looking for
+  //      opset 1 schemas if we fall through to here to find an ONNX operator's schema.
+  version = op_set_version;
+
   // Reject versions greater than what is actually supported.
-  *latest_schema = nullptr;
   if (!IsDomainVersionBeyondSupportedRange(domain, version)) {
     // if not found in registered custom schema registry, search in ONNX schema registry
     *latest_schema = ONNX_NAMESPACE::OpSchemaRegistry::Schema(key, version, domain);
diff --git a/onnxruntime/core/optimizer/utils.cc b/onnxruntime/core/optimizer/utils.cc
index fe40188f05..69d7a32090 100644
--- a/onnxruntime/core/optimizer/utils.cc
+++ b/onnxruntime/core/optimizer/utils.cc
@@ -290,7 +290,7 @@ bool GetClipConstantMinMax(const Graph& graph, const Node& node, float& min, flo
   max = std::numeric_limits<float>::max();
 
   // Clip opset 1 and 6 has min and max as attributes. they're inputs from opset 11 on.
-  bool min_max_are_attributes = node.SinceVersion() == 1 || node.SinceVersion() == 6;
+  bool min_max_are_attributes = node.SinceVersion() < 11;
   bool min_max_are_constant_values = true;
 
   if (min_max_are_attributes) {
diff --git a/onnxruntime/core/providers/cpu/nn/batch_norm.h b/onnxruntime/core/providers/cpu/nn/batch_norm.h
index de17dadaa1..3cbf6bf603 100644
--- a/onnxruntime/core/providers/cpu/nn/batch_norm.h
+++ b/onnxruntime/core/providers/cpu/nn/batch_norm.h
@@ -44,7 +44,7 @@ class BatchNorm : public OpKernel {
     // From opset 9 onwards, by default, only the spatial case (spatial == 1) is defined per spec
     // For opset 14 onwards, training is an attribute.
     // For opset < 14, since no training attribute is present we assume optional outputs indicate training mode.
-    if (op_kernel_info.node().SinceVersion() == 14) {
+    if (op_kernel_info.node().SinceVersion() >= 14) {
       is_train_ = op_kernel_info.GetAttrOrDefault<int64_t>("training_mode", 0) == 1;
     } else {
       is_train_ = op_kernel_info.GetOutputCount() > 1;
diff --git a/onnxruntime/test/framework/local_kernel_registry_test.cc b/onnxruntime/test/framework/local_kernel_registry_test.cc
index 291fb107ba..24b5438be5 100644
--- a/onnxruntime/test/framework/local_kernel_registry_test.cc
+++ b/onnxruntime/test/framework/local_kernel_registry_test.cc
@@ -10,21 +10,23 @@
 #include <thread>
 
 #include "core/common/logging/logging.h"
+#include "core/framework/customregistry.h"
 #include "core/framework/execution_provider.h"
 #include "core/framework/op_kernel.h"
 #include "core/framework/session_state.h"
 #include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/graph/op.h"
+#include "core/graph/schema_registry.h"
 #include "core/providers/cpu/cpu_execution_provider.h"
 #include "core/providers/cpu/math/element_wise_ops.h"
 #include "core/framework/tensorprotoutils.h"
 #include "test/capturing_sink.h"
 #include "test/test_environment.h"
+#include "test/util/include/asserts.h"
 #include "test_utils.h"
 #include "gtest/gtest.h"
-#include "core/graph/schema_registry.h"
-#include "core/framework/customregistry.h"
+
 using namespace ONNX_NAMESPACE;
 using namespace onnxruntime::common;
 
@@ -64,6 +66,7 @@ class FooKernel : public OpKernel {
 
 ONNX_NAMESPACE::OpSchema GetFooSchema() {
   ONNX_NAMESPACE::OpSchema schema("Foo", "unknown", 0);
+  schema.SetDomain("test");
   schema.Input(0,
                "A",
                "First operand, should share the type with the second operand.",
@@ -79,17 +82,15 @@ ONNX_NAMESPACE::OpSchema GetFooSchema() {
       "T",
       OpSchema::numeric_types_for_math_reduction(),
       "Constrain input and output types to high-precision numeric tensors.");
-  schema.SinceVersion(7);
+  schema.SinceVersion(1);
   return schema;
 }
 
-//For test purpose, we register this Foo kernel to Mul op.
-//Once the custom schema is ready, should update this.
-KernelDefBuilder FooKernelDef(const char* schema_name) {
+KernelDefBuilder FooKernelDef() {
   KernelDefBuilder def;
-  def.SetName(schema_name)
-      .SetDomain(onnxruntime::kOnnxDomain)
-      .SinceVersion(7)
+  def.SetName("Foo")
+      .SetDomain("test")
+      .SinceVersion(1)
       .Provider(onnxruntime::kCpuExecutionProvider)
       .TypeConstraint("T", DataTypeImpl::GetTensorType<float>());
   return def;
@@ -104,8 +105,8 @@ Status CreateFooKernel(FuncManager&, const OpKernelInfo& kernel_info, std::uniqu
 KernelDefBuilder OptionalKernelDef() {
   KernelDefBuilder def;
   def.SetName("OptionalOp")
-      .SetDomain(onnxruntime::kOnnxDomain)
-      .SinceVersion(6)
+      .SetDomain("test")
+      .SinceVersion(1)
       .Provider(onnxruntime::kCpuExecutionProvider)
       .TypeConstraint("T", DataTypeImpl::GetTensorType<float>());
   return def;
@@ -113,6 +114,7 @@ KernelDefBuilder OptionalKernelDef() {
 
 ONNX_NAMESPACE::OpSchema GetOptionalOpSchema() {
   ONNX_NAMESPACE::OpSchema schema("OptionalOp", "unknown", 0);
+  schema.SetDomain("test");
   schema.Input(0,
                "X",
                "First operand, should share the type with the second operand.",
@@ -129,7 +131,7 @@ ONNX_NAMESPACE::OpSchema GetOptionalOpSchema() {
       "T",
       OpSchema::numeric_types_for_math_reduction(),
       "Constrain input and output types to high-precision numeric tensors.");
-  schema.SinceVersion(6);
+  schema.SinceVersion(1);
   return schema;
 }
 
@@ -164,7 +166,7 @@ class OptionalOpKernel : public OpKernel {
       }
     }
 
-    //W is used or not
+    // W is used or not
     if (W) {
       auto* W_Data = W->Data<T>();
       for (size_t i = 0; i < size; i++) {
@@ -189,12 +191,10 @@ Status CreateOptionalOpKernel(FuncManager&, const OpKernelInfo& kernel_info, std
 
 static const std::string MUL_MODEL_URI = "testdata/mul_1.onnx";
 static const std::string FOO_MODEL_URI = "testdata/foo_1.onnx";
-static const std::string FOO_TRUNCATE_MODEL_URI = "testdata/foo_2.onnx";
-
+static const std::string FOO_CLIP_MODEL_URI = "testdata/foo_1_clip_11.onnx";
 static const std::string OPTIONAL_MODEL1_URI = "testdata/optional_1.onnx";
 
 void RunSession(InferenceSession& session_object,
-                RunOptions& run_options,
                 std::vector<int64_t>& dims_x,
                 std::vector<float>& values_x,
                 std::vector<int64_t>& dims_y,
@@ -211,9 +211,7 @@ void RunSession(InferenceSession& session_object,
   std::vector<OrtValue> fetches;
 
   // Now run
-  common::Status st = session_object.Run(run_options, feeds, output_names, &fetches);
-  std::cout << "Run returned status: " << st.ErrorMessage() << std::endl;
-  EXPECT_TRUE(st.IsOK());
+  EXPECT_STATUS_OK(session_object.Run(RunOptions{}, feeds, output_names, &fetches));
   ASSERT_EQ(1u, fetches.size());
   auto& rtensor = fetches.front().Get<Tensor>();
   TensorShape expected_shape(dims_y);
@@ -222,25 +220,27 @@ void RunSession(InferenceSession& session_object,
   ASSERT_EQ(values_y, found);
 }
 
-TEST(CustomKernelTests, CustomKernelWithBuildInSchema) {
+// This tests that a custom op can override an ONNX operator implemented by ORT.
+TEST(CustomKernelTests, CustomKernelWithBuiltInSchema) {
   SessionOptions so;
+  so.session_logid = "CustomKernelWithBuiltInSchema";
 
-  so.session_logid = "InferenceSessionTests.NoTimeout";
+  // Register a custom kernel that matches the ONNX Mul but is implemented to do an Add so we can validate the
+  // custom kernel overrides the ORT Mul kernel
+  KernelDefBuilder def;
+  def.SetName("Mul")
+      .SetDomain(onnxruntime::kOnnxDomain)
+      .SinceVersion(7)
+      .Provider(onnxruntime::kCpuExecutionProvider)
+      .TypeConstraint("T", DataTypeImpl::GetTensorType<float>());
 
-  // Register a foo kernel which is doing Add, but bind to Mul.
   std::shared_ptr<CustomRegistry> registry = std::make_shared<CustomRegistry>();
+  EXPECT_STATUS_OK(registry->RegisterCustomKernel(def, CreateFooKernel));
 
   InferenceSession session_object{so, GetEnvironment()};
-  EXPECT_TRUE(session_object.RegisterCustomRegistry(registry).IsOK());
-  auto def = FooKernelDef("Mul");
-
-  EXPECT_TRUE(registry->RegisterCustomKernel(def, CreateFooKernel).IsOK());
-
-  EXPECT_TRUE(session_object.Load(MUL_MODEL_URI).IsOK());
-  EXPECT_TRUE(session_object.Initialize().IsOK());
-
-  RunOptions run_options;
-  run_options.run_tag = "one session/one tag";
+  EXPECT_STATUS_OK(session_object.RegisterCustomRegistry(registry));
+  EXPECT_STATUS_OK(session_object.Load(MUL_MODEL_URI));
+  EXPECT_STATUS_OK(session_object.Initialize());
 
   // prepare inputs
   std::vector<int64_t> dims_x = {3, 2};
@@ -252,32 +252,27 @@ TEST(CustomKernelTests, CustomKernelWithBuildInSchema) {
   std::vector<float> expected_values_y = {2.0f, 4.0f, 6.0f, 8.0f, 10.0f, 12.0f};
 
   // Now run
-  RunSession(session_object, run_options, dims_x, values_x, expected_dims_y, expected_values_y);
+  RunSession(session_object, dims_x, values_x, expected_dims_y, expected_values_y);
 }
 
+// Test registering a custom kernel with custom schema
 TEST(CustomKernelTests, CustomKernelWithCustomSchema) {
   SessionOptions so;
 
-  so.session_logid = "InferenceSessionTests.NoTimeout";
+  so.session_logid = "CustomKernelWithCustomSchema";
 
+  // register foo schema
   std::shared_ptr<CustomRegistry> registry = std::make_shared<CustomRegistry>();
+  std::vector<OpSchema> schemas = {GetFooSchema()};
+  auto def = FooKernelDef();
+
+  EXPECT_STATUS_OK(registry->RegisterOpSet(schemas, "test", 1, 1000));
+  EXPECT_STATUS_OK(registry->RegisterCustomKernel(def, CreateFooKernel));
 
   InferenceSession session_object{so, GetEnvironment()};
-  EXPECT_TRUE(session_object.RegisterCustomRegistry(registry).IsOK());
-
-  //register foo schema
-  auto foo_schema = GetFooSchema();
-  std::vector<OpSchema> schemas = {foo_schema};
-  EXPECT_TRUE(registry->RegisterOpSet(schemas, onnxruntime::kOnnxDomain, 5, 7).IsOK());
-  auto def = FooKernelDef("Foo");
-  //Register a foo kernel which is doing Add, but bind to Mul.
-  EXPECT_TRUE(registry->RegisterCustomKernel(def, CreateFooKernel).IsOK());
-
-  EXPECT_TRUE(session_object.Load(FOO_MODEL_URI).IsOK());
-  EXPECT_TRUE(session_object.Initialize().IsOK());
-
-  RunOptions run_options;
-  run_options.run_tag = "one session/one tag";
+  EXPECT_STATUS_OK(session_object.RegisterCustomRegistry(registry));
+  EXPECT_STATUS_OK(session_object.Load(FOO_MODEL_URI));
+  EXPECT_STATUS_OK(session_object.Initialize());
 
   // prepare inputs
   std::vector<int64_t> dims_x = {3, 2};
@@ -289,32 +284,25 @@ TEST(CustomKernelTests, CustomKernelWithCustomSchema) {
   std::vector<float> expected_values_y = {2.0f, 4.0f, 6.0f, 8.0f, 10.0f, 12.0f};
 
   // Now run
-  RunSession(session_object, run_options, dims_x, values_x, expected_dims_y, expected_values_y);
+  RunSession(session_object, dims_x, values_x, expected_dims_y, expected_values_y);
 }
 
 TEST(CustomKernelTests, CustomKernelWithOptionalOutput) {
   SessionOptions so;
+  so.session_logid = "CustomKernelWithOptionalOutput";
 
-  so.session_logid = "InferenceSessionTests.NoTimeout";
-
-  //reigster optional schema
-  auto optional_schema = GetOptionalOpSchema();
-  std::vector<OpSchema> schemas = {optional_schema};
-
+  // register optional schema
   std::shared_ptr<CustomRegistry> registry = std::make_shared<CustomRegistry>();
-
-  EXPECT_TRUE(registry->RegisterOpSet(schemas, onnxruntime::kOnnxDomain, 5, 7).IsOK());
+  std::vector<OpSchema> schemas = {GetOptionalOpSchema()};
   auto def = OptionalKernelDef();
-  //Register a foo kernel which is doing Add, but bind to Mul.
-  EXPECT_TRUE(registry->RegisterCustomKernel(def, CreateOptionalOpKernel).IsOK());
+
+  EXPECT_STATUS_OK(registry->RegisterOpSet(schemas, "test", 1, 1000));
+  EXPECT_STATUS_OK(registry->RegisterCustomKernel(def, CreateOptionalOpKernel));
 
   InferenceSession session_object{so, GetEnvironment()};
-  EXPECT_TRUE(session_object.RegisterCustomRegistry(registry).IsOK());
-  EXPECT_TRUE(session_object.Load(OPTIONAL_MODEL1_URI).IsOK());
-  EXPECT_TRUE(session_object.Initialize().IsOK());
-
-  RunOptions run_options;
-  run_options.run_tag = "one session/one tag";
+  EXPECT_STATUS_OK(session_object.RegisterCustomRegistry(registry));
+  EXPECT_STATUS_OK(session_object.Load(OPTIONAL_MODEL1_URI));
+  EXPECT_STATUS_OK(session_object.Initialize());
 
   // prepare inputs
   std::vector<int64_t> dims_x = {3, 2};
@@ -326,7 +314,39 @@ TEST(CustomKernelTests, CustomKernelWithOptionalOutput) {
   std::vector<float> expected_values_y = {1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f};
 
   // Now run
-  RunSession(session_object, run_options, dims_x, values_x, expected_dims_y, expected_values_y);
+  RunSession(session_object, dims_x, values_x, expected_dims_y, expected_values_y);
+}
+
+// Regression test for OnnxRuntimeOpSchemaRegistry::GetSchemaAndHistory
+//
+// When there was a custom registry that matched the ONNX domain but not the current op, the earliest version from that
+// was being used in the fallthrough search of the ONNX schemas. This results in invalid matching.
+// e.g.
+//   Model with ONNX opset of 12.
+//   Custom op using ONNX domain with version range of 1..1000 (which is what the custom op registration code
+//   available via the ORT API uses by default) and custom op (called 'Foo' in our test).
+//
+// If the model has another ONNX op (Clip in our test), GetSchemaAndHistory was using the custom registry first,
+// 'version' gets set to 1 and the ONNX schema lookup matches that opset and not the model's opset. This leads to an
+// invalid schema being selected.
+TEST(CustomKernelTests, CustomOnnxKernelSchemaLookup) {
+  SessionOptions so;
+  so.session_logid = "CustomOnnxKernelSchemaLookup";
+
+  auto schema = GetFooSchema();
+  auto def = FooKernelDef();
+  schema.SetDomain(onnxruntime::kOnnxDomain);
+  def.SetDomain(onnxruntime::kOnnxDomain);
+
+  std::vector<OpSchema> schemas = {schema};
+  std::shared_ptr<CustomRegistry> registry = std::make_shared<CustomRegistry>();
+  EXPECT_STATUS_OK(registry->RegisterOpSet(schemas, onnxruntime::kOnnxDomain, 1, 1000));
+  EXPECT_STATUS_OK(registry->RegisterCustomKernel(def, CreateFooKernel));
+
+  InferenceSession session_object{so, GetEnvironment()};
+  EXPECT_STATUS_OK(session_object.RegisterCustomRegistry(registry));
+  EXPECT_STATUS_OK(session_object.Load(FOO_CLIP_MODEL_URI));
+  EXPECT_STATUS_OK(session_object.Initialize());
 }
 }  // namespace test
 }  // namespace onnxruntime
diff --git a/onnxruntime/test/shared_lib/test_inference.cc b/onnxruntime/test/shared_lib/test_inference.cc
index 52d3378159..6a0f5b39e2 100644
--- a/onnxruntime/test/shared_lib/test_inference.cc
+++ b/onnxruntime/test/shared_lib/test_inference.cc
@@ -399,7 +399,7 @@ TEST(CApiTest, custom_op_handler) {
   MyCustomOp custom_op{onnxruntime::kCpuExecutionProvider};
 #endif
 
-  Ort::CustomOpDomain custom_op_domain("");
+  Ort::CustomOpDomain custom_op_domain("test");
   custom_op_domain.Add(&custom_op);
 
 #ifdef USE_CUDA
@@ -430,7 +430,7 @@ TEST(CApiTest, custom_op_set_input_memory_type) {
   cudaStreamCreateWithFlags(&compute_stream, cudaStreamNonBlocking);
   MyCustomOpSecondInputOnCpu custom_op{onnxruntime::kCudaExecutionProvider, compute_stream};
 
-  Ort::CustomOpDomain custom_op_domain("");
+  Ort::CustomOpDomain custom_op_domain("test");
   custom_op_domain.Add(&custom_op);
 
   auto x_mem_type = custom_op.GetInputMemoryType(0);
@@ -462,7 +462,7 @@ TEST(CApiTest, standalone_op_handler) {
   StandaloneCustomOp standalone_op{onnxruntime::kCpuExecutionProvider};
 #endif
 
-  Ort::CustomOpDomain custom_op_domain("");
+  Ort::CustomOpDomain custom_op_domain("test");
   custom_op_domain.Add(&standalone_op);
 
 #ifdef USE_CUDA
@@ -599,7 +599,7 @@ TEST(CApiTest, multiple_varied_input_custom_op_handler) {
   MyCustomOpMultipleDynamicInputs custom_op{onnxruntime::kCpuExecutionProvider};
 #endif
 
-  Ort::CustomOpDomain custom_op_domain("");
+  Ort::CustomOpDomain custom_op_domain("test");
   custom_op_domain.Add(&custom_op);
 
   Ort::SessionOptions session_options;
@@ -1045,7 +1045,7 @@ TEST(CApiTest, optional_input_output_custom_op_handler) {
   // `MyCustomOpFooBar` defines a custom op with atmost 3 inputs and the second input is optional.
   // In this test, we are going to try and run 2 models - one with the optional input and one without
   // the optional input.
-  Ort::CustomOpDomain custom_op_domain("");
+  Ort::CustomOpDomain custom_op_domain("test");
   custom_op_domain.Add(&custom_op);
 
   Ort::SessionOptions session_options;
@@ -1126,7 +1126,7 @@ TEST(CApiTest, optional_input_output_custom_op_handler) {
 TEST(CApiTest, custom_op_with_attributes_handler) {
   MyCustomOpWithAttributes custom_op{onnxruntime::kCpuExecutionProvider};
 
-  Ort::CustomOpDomain custom_op_domain("");
+  Ort::CustomOpDomain custom_op_domain("test");
   custom_op_domain.Add(&custom_op);
 
   Ort::SessionOptions session_options;
@@ -1185,7 +1185,7 @@ TEST(CApiTest, RegisterCustomOpForCPUAndCUDA) {
   MyCustomOp custom_op_cpu{onnxruntime::kCpuExecutionProvider};
   // We are going to test session creation only - hence it is not a problem to use the default stream as the compute stream for the custom op
   MyCustomOp custom_op_cuda{onnxruntime::kCudaExecutionProvider};
-  Ort::CustomOpDomain custom_op_domain("");
+  Ort::CustomOpDomain custom_op_domain("test");
   custom_op_domain.Add(&custom_op_cpu);
   custom_op_domain.Add(&custom_op_cuda);
 
@@ -1194,7 +1194,6 @@ TEST(CApiTest, RegisterCustomOpForCPUAndCUDA) {
 }
 #endif
 
-
 #if defined(USE_OPENVINO) && (!defined(ORT_MINIMAL_BUILD) || defined(ORT_MINIMAL_BUILD_CUSTOM_OPS))
 TEST(CApiTest, test_custom_op_openvino_wrapper_library) {
   // Tests a custom operator that wraps an OpenVINO MNIST model (.xml and .bin files serialized into node attributes).
@@ -1332,7 +1331,7 @@ TEST(CApiTest, test_custom_op_library_registration_error) {
 #elif defined(__APPLE__)
   lib_name = ORT_TSTR("libcustom_op_invalid_library.dylib");
 #else
-  lib_name = ORT_TSTR("./libcustom_op_invalid_library.so");
+lib_name = ORT_TSTR("./libcustom_op_invalid_library.so");
 #endif
 
   Ort::SessionOptions session_options;
@@ -2708,4 +2707,4 @@ TEST(CApiTest, TestMultiStreamInferenceSimpleSSD) {
   std::vector<int64_t> expected_output_dims = {3, 256, 150, 150};
   ASSERT_TRUE(output_dims == expected_output_dims);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/onnxruntime/test/shared_lib/test_ort_format_models.cc b/onnxruntime/test/shared_lib/test_ort_format_models.cc
index be7b2a6136..c46b46f27d 100644
--- a/onnxruntime/test/shared_lib/test_ort_format_models.cc
+++ b/onnxruntime/test/shared_lib/test_ort_format_models.cc
@@ -80,7 +80,7 @@ TEST(OrtFormatCustomOpTests, ConvertOnnxModelToOrt) {
 #else
   MyCustomOp custom_op{onnxruntime::kCpuExecutionProvider};
 #endif
-  Ort::CustomOpDomain custom_op_domain("");
+  Ort::CustomOpDomain custom_op_domain("test");
   custom_op_domain.Add(&custom_op);
 
   // convert to ort by loading the onnx model
@@ -125,7 +125,7 @@ TEST(OrtFormatCustomOpTests, LoadOrtModel) {
   const std::basic_string<ORTCHAR_T> ort_file = ORT_TSTR("testdata/foo_1.onnx.ort");
 
   MyCustomOp custom_op{onnxruntime::kCpuExecutionProvider};
-  Ort::CustomOpDomain custom_op_domain("");
+  Ort::CustomOpDomain custom_op_domain("test");
   custom_op_domain.Add(&custom_op);
 
   //  load the ORT format model and execute it
diff --git a/onnxruntime/test/testdata/foo_1.onnx b/onnxruntime/test/testdata/foo_1.onnx
index 1627257888..218a898180 100644
Binary files a/onnxruntime/test/testdata/foo_1.onnx and b/onnxruntime/test/testdata/foo_1.onnx differ
diff --git a/onnxruntime/test/testdata/foo_1.onnx.ort b/onnxruntime/test/testdata/foo_1.onnx.ort
index 7ebbbe736e..11a5c42f2f 100644
Binary files a/onnxruntime/test/testdata/foo_1.onnx.ort and b/onnxruntime/test/testdata/foo_1.onnx.ort differ
diff --git a/onnxruntime/test/testdata/foo_1_clip_11.onnx b/onnxruntime/test/testdata/foo_1_clip_11.onnx
new file mode 100644
index 0000000000..c9aac4384f
Binary files /dev/null and b/onnxruntime/test/testdata/foo_1_clip_11.onnx differ
diff --git a/onnxruntime/test/testdata/foo_2.onnx b/onnxruntime/test/testdata/foo_2.onnx
deleted file mode 100644
index 0be1ced087..0000000000
Binary files a/onnxruntime/test/testdata/foo_2.onnx and /dev/null differ
diff --git a/onnxruntime/test/testdata/foo_3.onnx b/onnxruntime/test/testdata/foo_3.onnx
index 3293a799e4..eaefe4dcfb 100644
Binary files a/onnxruntime/test/testdata/foo_3.onnx and b/onnxruntime/test/testdata/foo_3.onnx differ
diff --git a/onnxruntime/test/testdata/foo_bar_1.onnx b/onnxruntime/test/testdata/foo_bar_1.onnx
index 8b0cbc5da2..0356849202 100644
--- a/onnxruntime/test/testdata/foo_bar_1.onnx
+++ b/onnxruntime/test/testdata/foo_bar_1.onnx
@@ -1,8 +1,8 @@
-onnx-example:l
-
+onnx-example:r
+
 X1
 X2
-X3
Y"FooBar
+X3
Y"FooBar:test
 test-modelZ
 X1
 
@@ -19,4 +19,5 @@ test-modelZ
 
Y
 
 

-
B
\ No newline at end of file
+
B
B
+test

\ No newline at end of file
diff --git a/onnxruntime/test/testdata/foo_bar_2.onnx b/onnxruntime/test/testdata/foo_bar_2.onnx
index 449997e6eb..f3c2528e86 100644
Binary files a/onnxruntime/test/testdata/foo_bar_2.onnx and b/onnxruntime/test/testdata/foo_bar_2.onnx differ
diff --git a/onnxruntime/test/testdata/foo_bar_3.onnx b/onnxruntime/test/testdata/foo_bar_3.onnx
index f645936f43..5dc769f6e8 100644
Binary files a/onnxruntime/test/testdata/foo_bar_3.onnx and b/onnxruntime/test/testdata/foo_bar_3.onnx differ
diff --git a/onnxruntime/test/testdata/optional_1.onnx b/onnxruntime/test/testdata/optional_1.onnx
index ae429a43b4..2640d9f144 100644
Binary files a/onnxruntime/test/testdata/optional_1.onnx and b/onnxruntime/test/testdata/optional_1.onnx differ