diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/Add.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/Add.test.cpp
index df230426b22..7927548ebd7 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/Add.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/Add.test.cpp
@@ -40,7 +40,7 @@ TEST_F(AddTest, INT32_P)
     const bool is_with_broadcast = false;
     test_model::TestData32IntAdd test_data_add_no_broadcasting(is_with_broadcast);
     std::vector<int32_t> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<int32_t>(&test_data_add_no_broadcasting);
+      onert_micro::execute::testing::checkKernel<int32_t>(2, &test_data_add_no_broadcasting);
     EXPECT_THAT(output_data_vector, test_data_add_no_broadcasting.get_output_data_by_index(0));
   }
   // With broadcast
@@ -48,7 +48,7 @@ TEST_F(AddTest, INT32_P)
     const bool is_with_broadcast = true;
     test_model::TestData32IntAdd test_data_add_with_broadcasting(is_with_broadcast);
     std::vector<int32_t> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<int32_t>(&test_data_add_with_broadcasting);
+      onert_micro::execute::testing::checkKernel<int32_t>(2, &test_data_add_with_broadcasting);
     EXPECT_THAT(output_data_vector, test_data_add_with_broadcasting.get_output_data_by_index(0));
   }
 }
@@ -60,7 +60,7 @@ TEST_F(AddTest, INT64_P)
     const bool is_with_broadcast = false;
     test_model::TestData64IntAdd test_data_add_no_broadcasting(is_with_broadcast);
     std::vector<int64_t> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<int64_t>(&test_data_add_no_broadcasting);
+      onert_micro::execute::testing::checkKernel<int64_t>(2, &test_data_add_no_broadcasting);
     EXPECT_THAT(output_data_vector, test_data_add_no_broadcasting.get_output_data_by_index(0));
   }
   // With broadcast
@@ -68,7 +68,7 @@ TEST_F(AddTest, INT64_P)
     const bool is_with_broadcast = true;
     test_model::TestData64IntAdd test_data_add_with_broadcasting(is_with_broadcast);
     std::vector<int64_t> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<int64_t>(&test_data_add_with_broadcasting);
+      onert_micro::execute::testing::checkKernel<int64_t>(2, &test_data_add_with_broadcasting);
     EXPECT_THAT(output_data_vector, test_data_add_with_broadcasting.get_output_data_by_index(0));
   }
 }
@@ -80,7 +80,7 @@ TEST_F(AddTest, Float_P)
     const bool is_with_broadcast = false;
     test_model::TestDataFloatAdd test_data_float_add_no_broadcasting(is_with_broadcast);
     std::vector<float> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<float>(&test_data_float_add_no_broadcasting);
+      onert_micro::execute::testing::checkKernel<float>(2, &test_data_float_add_no_broadcasting);
     EXPECT_THAT(
       output_data_vector,
       FloatArrayNear(test_data_float_add_no_broadcasting.get_output_data_by_index(0), 0.0001f));
@@ -90,7 +90,7 @@ TEST_F(AddTest, Float_P)
     const bool is_with_broadcast = true;
     test_model::TestDataFloatAdd test_data_float_add_with_broadcasting(is_with_broadcast);
     std::vector<float> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<float>(&test_data_float_add_with_broadcasting);
+      onert_micro::execute::testing::checkKernel<float>(2, &test_data_float_add_with_broadcasting);
     EXPECT_THAT(
       output_data_vector,
       FloatArrayNear(test_data_float_add_with_broadcasting.get_output_data_by_index(0), 0.0001f));
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/Concatenation.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/Concatenation.test.cpp
index d96efa32e5f..0d142568d53 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/Concatenation.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/Concatenation.test.cpp
@@ -37,7 +37,7 @@ TEST_F(ConcatenationTest, INT64_P)
 {
   test_model::TestDataS64Concatenation test_data_kernel;
   std::vector<int64_t> output_data_vector =
-    onert_micro::execute::testing::checkTISOKernel<int64_t>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<int64_t>(2, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
@@ -45,7 +45,7 @@ TEST_F(ConcatenationTest, INT32_P)
 {
   test_model::TestDataS32Concatenation test_data_kernel;
   std::vector<int32_t> output_data_vector =
-    onert_micro::execute::testing::checkTISOKernel<int32_t>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<int32_t>(2, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
@@ -53,7 +53,7 @@ TEST_F(ConcatenationTest, Float_P)
 {
   test_model::TestDataFloatConcatenation test_data_kernel;
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkTISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(2, &test_data_kernel);
   EXPECT_THAT(output_data_vector,
               FloatArrayNear(test_data_kernel.get_output_data_by_index(0), 0.0001f));
 }
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/Conv2D.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/Conv2D.test.cpp
index 49d59c9fddd..a60e25850be 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/Conv2D.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/Conv2D.test.cpp
@@ -36,7 +36,7 @@ TEST_F(Conv2DTest, Float_P)
 {
   onert_micro::test_model::TestDataFloatConv2D test_data_kernel;
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector,
               FloatArrayNear(test_data_kernel.get_output_data_by_index(0), 0.0001f));
 }
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/FullyConnected.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/FullyConnected.test.cpp
index 582e155e862..0954b089003 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/FullyConnected.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/FullyConnected.test.cpp
@@ -36,7 +36,7 @@ TEST_F(FullyConnectedTest, Float_P)
 {
   onert_micro::test_model::TestDataFloatFullyConnected test_data_kernel;
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/Gather.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/Gather.test.cpp
index e6655ecea4a..b3a47d4f9e6 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/Gather.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/Gather.test.cpp
@@ -37,7 +37,7 @@ TEST_F(GatherTest, Gather_Float_P)
 {
   onert_micro::test_model::TestDataFloatGather test_data_kernel;
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
@@ -45,7 +45,7 @@ TEST_F(GatherTest, Gather_Int_P)
 {
   onert_micro::test_model::TestDataIntGather test_data_kernel;
   std::vector<int32_t> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<int32_t>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<int32_t>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/Logistic.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/Logistic.test.cpp
index c041be0440b..6740c0fe68d 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/Logistic.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/Logistic.test.cpp
@@ -36,7 +36,7 @@ TEST_F(LogisticTest, Float_P)
 {
   onert_micro::test_model::TestDataFloatLogistic test_data_kernel;
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/MaxPool2D.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/MaxPool2D.test.cpp
index a4d3f4c487c..af51402748e 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/MaxPool2D.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/MaxPool2D.test.cpp
@@ -36,7 +36,7 @@ TEST_F(MaxPool2DTest, Float_P)
 {
   onert_micro::test_model::TestDataFloatMaxPool2D test_data_kernel;
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/Mul.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/Mul.test.cpp
index 803dbfa1eb3..339dbe44fbb 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/Mul.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/Mul.test.cpp
@@ -40,7 +40,7 @@ TEST_F(MulTest, INT_P)
     const bool is_with_broadcast = false;
     test_model::TestDataIntMul test_data_add_no_broadcasting(is_with_broadcast);
     std::vector<int32_t> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<int32_t>(&test_data_add_no_broadcasting);
+      onert_micro::execute::testing::checkKernel<int32_t>(2, &test_data_add_no_broadcasting);
     EXPECT_THAT(output_data_vector, test_data_add_no_broadcasting.get_output_data_by_index(0));
   }
   // With broadcast
@@ -48,7 +48,7 @@ TEST_F(MulTest, INT_P)
     const bool is_with_broadcast = true;
     test_model::TestDataIntMul test_data_add_with_broadcasting(is_with_broadcast);
     std::vector<int32_t> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<int32_t>(&test_data_add_with_broadcasting);
+      onert_micro::execute::testing::checkKernel<int32_t>(2, &test_data_add_with_broadcasting);
     EXPECT_THAT(output_data_vector, test_data_add_with_broadcasting.get_output_data_by_index(0));
   }
 }
@@ -60,7 +60,7 @@ TEST_F(MulTest, Float_P)
     const bool is_with_broadcast = false;
     test_model::TestDataFloatMul test_data_float_add_no_broadcasting(is_with_broadcast);
     std::vector<float> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<float>(&test_data_float_add_no_broadcasting);
+      onert_micro::execute::testing::checkKernel<float>(2, &test_data_float_add_no_broadcasting);
     EXPECT_THAT(
       output_data_vector,
       FloatArrayNear(test_data_float_add_no_broadcasting.get_output_data_by_index(0), 0.0001f));
@@ -70,7 +70,7 @@ TEST_F(MulTest, Float_P)
     const bool is_with_broadcast = true;
     test_model::TestDataFloatMul test_data_float_add_with_broadcasting(is_with_broadcast);
     std::vector<float> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<float>(&test_data_float_add_with_broadcasting);
+      onert_micro::execute::testing::checkKernel<float>(2, &test_data_float_add_with_broadcasting);
     EXPECT_THAT(
       output_data_vector,
       FloatArrayNear(test_data_float_add_with_broadcasting.get_output_data_by_index(0), 0.0001f));
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/Pack.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/Pack.test.cpp
index e1b82642fe4..1f63ea31794 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/Pack.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/Pack.test.cpp
@@ -35,7 +35,7 @@ TEST_F(PackTest, Float_P)
 {
   test_model::TestDataFloatPack test_data_kernel;
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkTISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(2, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
@@ -43,7 +43,7 @@ TEST_F(PackTest, Int_P)
 {
   test_model::TestDataIntPack test_data_kernel;
   std::vector<int32_t> output_data_vector =
-    onert_micro::execute::testing::checkTISOKernel<int32_t>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<int32_t>(2, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/ReduceProd.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/ReduceProd.test.cpp
index 855d03c3978..fdcc2d07c30 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/ReduceProd.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/ReduceProd.test.cpp
@@ -36,7 +36,7 @@ TEST_F(ReduceProdTest, Reduce_Prod_Float_P)
 {
   onert_micro::test_model::TestDataFloatReduceProd test_data_kernel;
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
@@ -44,7 +44,7 @@ TEST_F(ReduceProdTest, Reduce_Prod_Int_P)
 {
   onert_micro::test_model::TestDataIntReduceProd test_data_kernel;
   std::vector<int32_t> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<int32_t>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<int32_t>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/Reshape.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/Reshape.test.cpp
index d7616b11270..dda748e54b3 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/Reshape.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/Reshape.test.cpp
@@ -35,14 +35,14 @@ TEST_F(ReshapeTest, MainTest_P)
 {
   onert_micro::test_model::TestDataReshapeKernel<float> test_data_kernel(false);
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
 TEST_F(ReshapeTest, MainTest_NEG)
 {
   onert_micro::test_model::TestDataReshapeKernel<float> test_data_kernel(true);
-  EXPECT_DEATH(checkSISOKernel(&test_data_kernel), "");
+  EXPECT_DEATH(checkKernel(1, &test_data_kernel), "");
 }
 
 } // namespace testing
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/Shape.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/Shape.test.cpp
index 4c243de23fa..eb171524562 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/Shape.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/Shape.test.cpp
@@ -36,7 +36,7 @@ TEST_F(ShapeTest, MainTest_P)
 {
   onert_micro::test_model::TestDataShapeKernel<float, int32_t> test_data_kernel;
   std::vector<int32_t> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<float, int32_t>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float, int32_t>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/StridedSlice.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/StridedSlice.test.cpp
index 62dff72617c..8629763c776 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/StridedSlice.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/StridedSlice.test.cpp
@@ -35,7 +35,7 @@ TEST_F(StridedSliceTest, MainTest_P)
 {
   onert_micro::test_model::TestDataStridedSliceKernel<float> test_data_kernel;
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector, test_data_kernel.get_output_data_by_index(0));
 }
 
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/Sub.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/Sub.test.cpp
index 49ef781c2ca..91d9da48a75 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/Sub.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/Sub.test.cpp
@@ -40,7 +40,7 @@ TEST_F(SubTest, INT_P)
     const bool is_with_broadcast = false;
     test_model::TestDataIntSub test_data_add_no_broadcasting(is_with_broadcast);
     std::vector<int32_t> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<int32_t>(&test_data_add_no_broadcasting);
+      onert_micro::execute::testing::checkKernel<int32_t>(2, &test_data_add_no_broadcasting);
     EXPECT_THAT(output_data_vector, test_data_add_no_broadcasting.get_output_data_by_index(0));
   }
   // With broadcast
@@ -48,7 +48,7 @@ TEST_F(SubTest, INT_P)
     const bool is_with_broadcast = true;
     test_model::TestDataIntSub test_data_add_with_broadcasting(is_with_broadcast);
     std::vector<int32_t> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<int32_t>(&test_data_add_with_broadcasting);
+      onert_micro::execute::testing::checkKernel<int32_t>(2, &test_data_add_with_broadcasting);
     EXPECT_THAT(output_data_vector, test_data_add_with_broadcasting.get_output_data_by_index(0));
   }
 }
@@ -60,7 +60,7 @@ TEST_F(SubTest, Float_P)
     const bool is_with_broadcast = false;
     test_model::TestDataFloatSub test_data_float_add_no_broadcasting(is_with_broadcast);
     std::vector<float> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<float>(&test_data_float_add_no_broadcasting);
+      onert_micro::execute::testing::checkKernel<float>(2, &test_data_float_add_no_broadcasting);
     EXPECT_THAT(
       output_data_vector,
       FloatArrayNear(test_data_float_add_no_broadcasting.get_output_data_by_index(0), 0.0001f));
@@ -70,7 +70,7 @@ TEST_F(SubTest, Float_P)
     const bool is_with_broadcast = true;
     test_model::TestDataFloatSub test_data_float_add_with_broadcasting(is_with_broadcast);
     std::vector<float> output_data_vector =
-      onert_micro::execute::testing::checkTISOKernel<float>(&test_data_float_add_with_broadcasting);
+      onert_micro::execute::testing::checkKernel<float>(2, &test_data_float_add_with_broadcasting);
     EXPECT_THAT(
       output_data_vector,
       FloatArrayNear(test_data_float_add_with_broadcasting.get_output_data_by_index(0), 0.0001f));
diff --git a/onert-micro/onert-micro/src/execute/kernels/tests/UnidirectionalSequenceLSTM.test.cpp b/onert-micro/onert-micro/src/execute/kernels/tests/UnidirectionalSequenceLSTM.test.cpp
index 648fe68a4fa..5ff3c3f628a 100644
--- a/onert-micro/onert-micro/src/execute/kernels/tests/UnidirectionalSequenceLSTM.test.cpp
+++ b/onert-micro/onert-micro/src/execute/kernels/tests/UnidirectionalSequenceLSTM.test.cpp
@@ -35,7 +35,7 @@ TEST_F(UnidirLSTMTest, Float_P)
 {
   onert_micro::test_model::TestDataFloatUnidirectionalLSTM test_data_kernel;
   std::vector<float> output_data_vector =
-    onert_micro::execute::testing::checkSISOKernel<float>(&test_data_kernel);
+    onert_micro::execute::testing::checkKernel<float>(1, &test_data_kernel);
   EXPECT_THAT(output_data_vector,
               FloatArrayNear(test_data_kernel.get_output_data_by_index(0), 0.0001f));
 }