diff --git a/tensorflow/lite/micro/kernels/BUILD b/tensorflow/lite/micro/kernels/BUILD
index 1ed3d08ba6d..f62ea111062 100644
--- a/tensorflow/lite/micro/kernels/BUILD
+++ b/tensorflow/lite/micro/kernels/BUILD
@@ -27,6 +27,48 @@ package_group(
     packages = ["//tensorflow/lite/micro"],
 )
 
+cc_library(
+    name = "activation_utils",
+    hdrs = ["activation_utils.h"],
+    deps = [
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/kernels/internal:cppmath",
+    ],
+)
+
+cc_library(
+    name = "conv_test_common",
+    srcs = [
+        "conv_test_common.cc",
+    ],
+    hdrs = [
+        "conv_test.h",
+    ],
+    deps = [
+        ":kernel_runner",
+        ":micro_ops",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+cc_library(
+    name = "ethosu",
+    srcs = [
+        "ethosu.cc",
+    ],
+    hdrs = ["ethosu.h"],
+    copts = micro_copts(),
+    visibility = [
+        # Kernel variants need to be visible to the examples and benchmarks.
+        ":micro",
+    ],
+    deps = [
+        "//tensorflow/lite/c:common",
+    ],
+)
+
 cc_library(
     name = "fixedpoint_utils",
     hdrs = select({
@@ -48,6 +90,16 @@ cc_library(
     }),
 )
 
+cc_library(
+    name = "flexbuffers_generated_data",
+    srcs = [
+        "flexbuffers_generated_data.cc",
+    ],
+    hdrs = [
+        "flexbuffers_generated_data.h",
+    ],
+)
+
 cc_library(
     name = "fully_connected",
     srcs = [
@@ -85,18 +137,30 @@ cc_library(
 )
 
 cc_library(
-    name = "ethosu",
+    name = "kernel_runner",
     srcs = [
-        "ethosu.cc",
-    ],
-    hdrs = ["ethosu.h"],
-    copts = micro_copts(),
-    visibility = [
-        # Kernel variants need to be visible to the examples and benchmarks.
-        ":micro",
+        "kernel_runner.cc",
     ],
+    hdrs = ["kernel_runner.h"],
     deps = [
         "//tensorflow/lite/c:common",
+        "//tensorflow/lite/kernels/internal:compatibility",
+        "//tensorflow/lite/micro:micro_error_reporter",
+        "//tensorflow/lite/micro:micro_framework",
+    ],
+)
+
+cc_library(
+    name = "kernel_util",
+    srcs = [
+        "kernel_util.cc",
+    ],
+    hdrs = ["kernel_util.h"],
+    deps = [
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/kernels/internal:compatibility",
+        "//tensorflow/lite/kernels/internal:types",
+        "//tensorflow/lite/micro:debug_log",
     ],
 )
 
@@ -200,6 +264,11 @@ cc_library(
     }),
 )
 
+cc_library(
+    name = "micro_utils",
+    hdrs = ["micro_utils.h"],
+)
+
 cc_library(
     name = "xtensa",
     hdrs = select({
@@ -218,10 +287,78 @@ cc_library(
     }),
 )
 
+cc_test(
+    name = "shape_test",
+    srcs = ["shape_test.cc"],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
 test_suite(
     name = "all_tests",
 )
 
+tflite_micro_cc_test(
+    name = "activations_test",
+    srcs = [
+        "activations_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "add_test",
+    srcs = [
+        "add_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "arg_min_max_test",
+    srcs = [
+        "arg_min_max_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "batch_to_space_nd_test",
+    srcs = [
+        "batch_to_space_nd_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
 tflite_micro_cc_test(
     name = "cast_test",
     srcs = ["cast_test.cc"],
@@ -235,6 +372,119 @@ tflite_micro_cc_test(
     ],
 )
 
+tflite_micro_cc_test(
+    name = "ceil_test",
+    srcs = [
+        "ceil_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "circular_buffer_test",
+    srcs = [
+        "circular_buffer_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        ":micro_ops",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "comparisons_test",
+    srcs = [
+        "comparisons_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "concatenation_test",
+    srcs = [
+        "concatenation_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "conv_test",
+    srcs = [
+        "conv_test.cc",
+    ],
+    deps = [
+        ":conv_test_common",
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:micro_utils",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "depthwise_conv_test",
+    srcs = [
+        "depthwise_conv_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/kernels/internal:tensor",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "dequantize_test",
+    srcs = [
+        "dequantize_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "detection_postprocess_test",
+    srcs = [
+        "detection_postprocess_test.cc",
+    ],
+    deps = [
+        ":flexbuffers_generated_data",
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/kernels/internal:tensor",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+        "@flatbuffers",
+    ],
+)
+
 tflite_micro_cc_test(
     name = "elementwise_test",
     srcs = ["elementwise_test.cc"],
@@ -262,71 +512,19 @@ tflite_micro_cc_test(
 )
 
 tflite_micro_cc_test(
-    name = "zeros_like_test",
-    srcs = ["zeros_like_test.cc"],
+    name = "floor_test",
+    srcs = [
+        "floor_test.cc",
+    ],
     deps = [
         ":kernel_runner",
         "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:debug_log",
         "//tensorflow/lite/micro:op_resolvers",
         "//tensorflow/lite/micro:test_helpers",
         "//tensorflow/lite/micro/testing:micro_test",
     ],
 )
 
-tflite_micro_cc_test(
-    name = "pooling_test",
-    srcs = [
-        "pooling_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "depthwise_conv_test",
-    srcs = [
-        "depthwise_conv_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/kernels/internal:tensor",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-cc_library(
-    name = "flexbuffers_generated_data",
-    srcs = [
-        "flexbuffers_generated_data.cc",
-    ],
-    hdrs = [
-        "flexbuffers_generated_data.h",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "detection_postprocess_test",
-    srcs = [
-        "detection_postprocess_test.cc",
-    ],
-    deps = [
-        ":flexbuffers_generated_data",
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/kernels/internal:tensor",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-        "@flatbuffers",
-    ],
-)
-
 tflite_micro_cc_test(
     name = "fully_connected_test",
     srcs = [
@@ -343,10 +541,8 @@ tflite_micro_cc_test(
 )
 
 tflite_micro_cc_test(
-    name = "softmax_test",
-    srcs = [
-        "softmax_test.cc",
-    ],
+    name = "hard_swish_test",
+    srcs = ["hard_swish_test.cc"],
     deps = [
         ":kernel_runner",
         "//tensorflow/lite/c:common",
@@ -357,81 +553,9 @@ tflite_micro_cc_test(
 )
 
 tflite_micro_cc_test(
-    name = "logistic_test",
+    name = "l2norm_test",
     srcs = [
-        "logistic_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "svdf_test",
-    srcs = [
-        "svdf_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-cc_library(
-    name = "conv_test_common",
-    srcs = [
-        "conv_test_common.cc",
-    ],
-    hdrs = [
-        "conv_test.h",
-    ],
-    deps = [
-        ":kernel_runner",
-        ":micro_ops",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "conv_test",
-    srcs = [
-        "conv_test.cc",
-    ],
-    deps = [
-        ":conv_test_common",
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:micro_utils",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "prelu_test",
-    srcs = [
-        "prelu_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "floor_test",
-    srcs = [
-        "floor_test.cc",
+        "l2norm_test.cc",
     ],
     deps = [
         ":kernel_runner",
@@ -457,9 +581,9 @@ tflite_micro_cc_test(
 )
 
 tflite_micro_cc_test(
-    name = "neg_test",
+    name = "logistic_test",
     srcs = [
-        "neg_test.cc",
+        "logistic_test.cc",
     ],
     deps = [
         ":kernel_runner",
@@ -498,77 +622,9 @@ tflite_micro_cc_test(
 )
 
 tflite_micro_cc_test(
-    name = "sub_test",
+    name = "neg_test",
     srcs = [
-        "sub_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "arg_min_max_test",
-    srcs = [
-        "arg_min_max_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "comparisons_test",
-    srcs = [
-        "comparisons_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "ceil_test",
-    srcs = [
-        "ceil_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "round_test",
-    srcs = [
-        "round_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "strided_slice_test",
-    srcs = [
-        "strided_slice_test.cc",
+        "neg_test.cc",
     ],
     deps = [
         ":kernel_runner",
@@ -594,14 +650,155 @@ tflite_micro_cc_test(
 )
 
 tflite_micro_cc_test(
-    name = "unpack_test",
+    name = "pad_test",
     srcs = [
-        "unpack_test.cc",
+        "pad_test.cc",
+    ],
+    tags = [
+        "noasan",
+        "nomsan",
+    ],  # TODO(b/175133159): currently failing with asan and msan
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "pooling_test",
+    srcs = [
+        "pooling_test.cc",
     ],
     deps = [
         ":kernel_runner",
         "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:debug_log",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "prelu_test",
+    srcs = [
+        "prelu_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "quantization_util_test",
+    srcs = [
+        "quantization_util_test.cc",
+    ],
+    deps = [
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/kernels/internal:quantization_util",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "quantize_test",
+    srcs = [
+        "quantize_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "reduce_test",
+    srcs = [
+        "reduce_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "reshape_test",
+    srcs = [
+        "reshape_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/kernels/internal:tensor",
+        "//tensorflow/lite/micro:micro_utils",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "resize_nearest_neighbor_test",
+    srcs = [
+        "resize_nearest_neighbor_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "round_test",
+    srcs = [
+        "round_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "softmax_test",
+    srcs = [
+        "softmax_test.cc",
+    ],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:op_resolvers",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "space_to_batch_nd_test",
+    srcs = [
+        "space_to_batch_nd_test.cc",
+    ],
+    deps = [
+        ":conv_test_common",
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:micro_utils",
         "//tensorflow/lite/micro:test_helpers",
         "//tensorflow/lite/micro/testing:micro_test",
     ],
@@ -638,9 +835,9 @@ tflite_micro_cc_test(
 )
 
 tflite_micro_cc_test(
-    name = "add_test",
+    name = "strided_slice_test",
     srcs = [
-        "add_test.cc",
+        "strided_slice_test.cc",
     ],
     deps = [
         ":kernel_runner",
@@ -652,30 +849,9 @@ tflite_micro_cc_test(
 )
 
 tflite_micro_cc_test(
-    name = "quantization_util_test",
+    name = "sub_test",
     srcs = [
-        "quantization_util_test.cc",
-    ],
-    deps = [
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/kernels/internal:quantization_util",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-cc_library(
-    name = "activation_utils",
-    hdrs = ["activation_utils.h"],
-    deps = [
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/kernels/internal:cppmath",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "quantize_test",
-    srcs = [
-        "quantize_test.cc",
+        "sub_test.cc",
     ],
     deps = [
         ":kernel_runner",
@@ -686,9 +862,9 @@ tflite_micro_cc_test(
 )
 
 tflite_micro_cc_test(
-    name = "dequantize_test",
+    name = "svdf_test",
     srcs = [
-        "dequantize_test.cc",
+        "svdf_test.cc",
     ],
     deps = [
         ":kernel_runner",
@@ -698,156 +874,6 @@ tflite_micro_cc_test(
     ],
 )
 
-cc_library(
-    name = "kernel_runner",
-    srcs = [
-        "kernel_runner.cc",
-    ],
-    hdrs = ["kernel_runner.h"],
-    deps = [
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/kernels/internal:compatibility",
-        "//tensorflow/lite/micro:micro_error_reporter",
-        "//tensorflow/lite/micro:micro_framework",
-    ],
-)
-
-cc_library(
-    name = "kernel_util",
-    srcs = [
-        "kernel_util.cc",
-    ],
-    hdrs = ["kernel_util.h"],
-    deps = [
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/kernels/internal:compatibility",
-        "//tensorflow/lite/kernels/internal:types",
-        "//tensorflow/lite/micro:debug_log",
-    ],
-)
-
-cc_library(
-    name = "micro_utils",
-    hdrs = ["micro_utils.h"],
-)
-
-tflite_micro_cc_test(
-    name = "reshape_test",
-    srcs = [
-        "reshape_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/kernels/internal:tensor",
-        "//tensorflow/lite/micro:micro_utils",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "activations_test",
-    srcs = [
-        "activations_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "concatenation_test",
-    srcs = [
-        "concatenation_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "pad_test",
-    srcs = [
-        "pad_test.cc",
-    ],
-    tags = [
-        "noasan",
-        "nomsan",
-    ],  # TODO(b/175133159): currently failing with asan and msan
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "reduce_test",
-    srcs = [
-        "reduce_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "circular_buffer_test",
-    srcs = [
-        "circular_buffer_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        ":micro_ops",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "resize_nearest_neighbor_test",
-    srcs = [
-        "resize_nearest_neighbor_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "l2norm_test",
-    srcs = [
-        "l2norm_test.cc",
-    ],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
 tflite_micro_cc_test(
     name = "tanh_test",
     srcs = ["tanh_test.cc"],
@@ -859,45 +885,6 @@ tflite_micro_cc_test(
     ],
 )
 
-tflite_micro_cc_test(
-    name = "hard_swish_test",
-    srcs = ["hard_swish_test.cc"],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-cc_test(
-    name = "shape_test",
-    srcs = ["shape_test.cc"],
-    deps = [
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:op_resolvers",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
-tflite_micro_cc_test(
-    name = "space_to_batch_nd_test",
-    srcs = [
-        "space_to_batch_nd_test.cc",
-    ],
-    deps = [
-        ":conv_test_common",
-        ":kernel_runner",
-        "//tensorflow/lite/c:common",
-        "//tensorflow/lite/micro:micro_utils",
-        "//tensorflow/lite/micro:test_helpers",
-        "//tensorflow/lite/micro/testing:micro_test",
-    ],
-)
-
 tflite_micro_cc_test(
     name = "transpose_conv_test",
     srcs = [
@@ -914,13 +901,26 @@ tflite_micro_cc_test(
 )
 
 tflite_micro_cc_test(
-    name = "batch_to_space_nd_test",
+    name = "unpack_test",
     srcs = [
-        "batch_to_space_nd_test.cc",
+        "unpack_test.cc",
     ],
     deps = [
         ":kernel_runner",
         "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:debug_log",
+        "//tensorflow/lite/micro:test_helpers",
+        "//tensorflow/lite/micro/testing:micro_test",
+    ],
+)
+
+tflite_micro_cc_test(
+    name = "zeros_like_test",
+    srcs = ["zeros_like_test.cc"],
+    deps = [
+        ":kernel_runner",
+        "//tensorflow/lite/c:common",
+        "//tensorflow/lite/micro:debug_log",
         "//tensorflow/lite/micro:op_resolvers",
         "//tensorflow/lite/micro:test_helpers",
         "//tensorflow/lite/micro/testing:micro_test",