Factoring out strings ops tests into its own folder as per go/tf-ops-breakdown

PiperOrigin-RevId: 406690326
Change-Id: Ib8636506b777b017a953a3d07a8981436b6e3ba6
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index d35c3cb..020b071 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -16,20 +16,6 @@
 # fix the shared/overbroad dependencies.
 
 tf_py_test(
-    name = "as_string_op_test",
-    size = "small",
-    srcs = ["as_string_op_test.py"],
-    tags = ["no_windows"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:string_ops",
-        "//third_party/py/numpy",
-    ],
-)
-
-tf_py_test(
     name = "attention_ops_test",
     size = "small",
     srcs = ["attention_ops_test.py"],
@@ -61,22 +47,6 @@
     ],
 )
 
-tf_py_test(
-    name = "base64_ops_test",
-    size = "small",
-    srcs = ["base64_ops_test.py"],
-    tags = ["nomac"],  # b/35468214
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:string_ops",
-        "//third_party/py/numpy",
-    ],
-)
-
 cuda_py_test(
     name = "list_ops_test",
     size = "small",
@@ -806,32 +776,6 @@
 )
 
 tf_py_test(
-    name = "regex_replace_op_test",
-    size = "small",
-    srcs = ["regex_replace_op_test.py"],
-    deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:constant_op",
-        "//tensorflow/python:dtypes",
-        "//tensorflow/python:string_ops",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
-tf_py_test(
-    name = "regex_full_match_op_test",
-    size = "small",
-    srcs = ["regex_full_match_op_test.py"],
-    deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:constant_op",
-        "//tensorflow/python:dtypes",
-        "//tensorflow/python:string_ops",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
-tf_py_test(
     name = "save_restore_ops_test",
     size = "small",
     srcs = ["save_restore_ops_test.py"],
@@ -969,133 +913,6 @@
     ],
 )
 
-tf_py_test(
-    name = "string_format_op_test",
-    size = "small",
-    srcs = ["string_format_op_test.py"],
-    deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:string_ops",
-    ],
-)
-
-tf_py_test(
-    name = "string_join_op_test",
-    size = "small",
-    srcs = ["string_join_op_test.py"],
-    deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:string_ops",
-    ],
-)
-
-tf_py_test(
-    name = "string_split_op_test",
-    size = "small",
-    srcs = ["string_split_op_test.py"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:string_ops",
-        "//tensorflow/python:util",
-        "//tensorflow/python/ops/ragged:ragged_factory_ops",
-        "//tensorflow/python/ops/ragged:ragged_string_ops",
-        "//third_party/py/numpy",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
-tf_py_test(
-    name = "string_bytes_split_op_test",
-    size = "small",
-    srcs = ["string_bytes_split_op_test.py"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:string_ops",
-        "//tensorflow/python/ops/ragged",
-        "//tensorflow/python/ops/ragged:ragged_factory_ops",
-        "//tensorflow/python/ops/ragged:ragged_string_ops",
-        "//third_party/py/numpy",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
-tf_py_test(
-    name = "string_length_op_test",
-    size = "small",
-    srcs = ["string_length_op_test.py"],
-    deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:string_ops",
-    ],
-)
-
-tf_py_test(
-    name = "string_strip_op_test",
-    size = "small",
-    srcs = ["string_strip_op_test.py"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:string_ops",
-        "//third_party/py/numpy",
-    ],
-)
-
-tf_py_test(
-    name = "string_lower_op_test",
-    size = "small",
-    srcs = ["string_lower_op_test.py"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:string_ops",
-        "//third_party/py/numpy",
-    ],
-)
-
-tf_py_test(
-    name = "string_upper_op_test",
-    size = "small",
-    srcs = ["string_upper_op_test.py"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:string_ops",
-        "//third_party/py/numpy",
-    ],
-)
-
-tf_py_test(
-    name = "substr_op_test",
-    size = "small",
-    srcs = ["substr_op_test.py"],
-    deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:string_ops",
-        "//third_party/py/numpy",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
 cuda_py_test(
     name = "summary_ops_test",
     size = "small",
@@ -1202,18 +1019,6 @@
     ],
 )
 
-tf_py_test(
-    name = "unicode_script_op_test",
-    size = "small",
-    srcs = ["unicode_script_op_test.py"],
-    deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:constant_op",
-        "//tensorflow/python:dtypes",
-        "//tensorflow/python:string_ops",
-    ],
-)
-
 cuda_py_test(
     name = "nth_element_op_test",
     size = "small",
@@ -1230,56 +1035,6 @@
 )
 
 tf_py_test(
-    name = "unicode_encode_op_test",
-    size = "small",
-    srcs = ["unicode_encode_op_test.py"],
-    deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:constant_op",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python/ops/ragged:ragged_factory_ops",
-        "//tensorflow/python/ops/ragged:ragged_string_ops",
-        "//tensorflow/python/ops/ragged:ragged_tensor",
-        "//tensorflow/python/ops/ragged:ragged_tensor_value",
-        "//third_party/py/numpy",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
-tf_py_test(
-    name = "unicode_transcode_op_test",
-    size = "small",
-    srcs = ["unicode_transcode_op_test.py"],
-    deps = [
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:string_ops",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
-tf_py_test(
-    name = "unicode_decode_op_test",
-    size = "small",
-    srcs = ["unicode_decode_op_test.py"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:sparse_tensor",
-        "//tensorflow/python:string_ops",
-        "//tensorflow/python/eager:context",
-        "//tensorflow/python/ops/ragged",
-        "//tensorflow/python/ops/ragged:ragged_factory_ops",
-        "//tensorflow/python/ops/ragged:ragged_string_ops",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
-tf_py_test(
     name = "variable_scope_test",
     size = "small",
     srcs = ["variable_scope_test.py"],
@@ -1860,32 +1615,6 @@
 )
 
 cuda_py_test(
-    name = "reduce_join_op_test",
-    size = "small",
-    srcs = ["reduce_join_op_test.py"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:string_ops",
-        "//third_party/py/numpy",
-    ],
-)
-
-cuda_py_test(
-    name = "unsorted_segment_join_op_test",
-    size = "small",
-    srcs = ["unsorted_segment_join_op_test.py"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:string_ops",
-        "//third_party/py/numpy",
-    ],
-)
-
-cuda_py_test(
     name = "relu_op_test",
     size = "small",
     srcs = ["relu_op_test.py"],
@@ -2098,30 +1827,6 @@
 )
 
 cuda_py_test(
-    name = "string_to_hash_bucket_op_test",
-    size = "small",
-    srcs = ["string_to_hash_bucket_op_test.py"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:string_ops",
-    ],
-)
-
-cuda_py_test(
-    name = "string_to_number_op_test",
-    size = "small",
-    srcs = ["string_to_number_op_test.py"],
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:parsing_ops",
-    ],
-)
-
-cuda_py_test(
     name = "summary_v1_audio_op_test",
     size = "small",
     srcs = ["summary_v1_audio_op_test.py"],
diff --git a/tensorflow/python/kernel_tests/strings_ops/BUILD b/tensorflow/python/kernel_tests/strings_ops/BUILD
new file mode 100644
index 0000000..3600f39
--- /dev/null
+++ b/tensorflow/python/kernel_tests/strings_ops/BUILD
@@ -0,0 +1,306 @@
+# Tests of TensorFlow math kernels written using the Python API.
+
+load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+
+# buildifier: disable=same-origin-load
+load("//tensorflow:tensorflow.bzl", "tf_py_test")
+
+package(
+    default_visibility = ["//tensorflow:internal"],
+    licenses = ["notice"],
+)
+
+tf_py_test(
+    name = "as_string_op_test",
+    size = "small",
+    srcs = ["as_string_op_test.py"],
+    tags = ["no_windows"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
+    ],
+)
+
+tf_py_test(
+    name = "base64_ops_test",
+    size = "small",
+    srcs = ["base64_ops_test.py"],
+    tags = ["nomac"],  # b/35468214
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
+    ],
+)
+
+cuda_py_test(
+    name = "reduce_join_op_test",
+    size = "small",
+    srcs = ["reduce_join_op_test.py"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
+    ],
+)
+
+tf_py_test(
+    name = "regex_full_match_op_test",
+    size = "small",
+    srcs = ["regex_full_match_op_test.py"],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:string_ops",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+tf_py_test(
+    name = "regex_replace_op_test",
+    size = "small",
+    srcs = ["regex_replace_op_test.py"],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:string_ops",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+tf_py_test(
+    name = "string_bytes_split_op_test",
+    size = "small",
+    srcs = ["string_bytes_split_op_test.py"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:string_ops",
+        "//tensorflow/python/ops/ragged",
+        "//tensorflow/python/ops/ragged:ragged_factory_ops",
+        "//tensorflow/python/ops/ragged:ragged_string_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+tf_py_test(
+    name = "string_format_op_test",
+    size = "small",
+    srcs = ["string_format_op_test.py"],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:string_ops",
+    ],
+)
+
+tf_py_test(
+    name = "string_join_op_test",
+    size = "small",
+    srcs = ["string_join_op_test.py"],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:string_ops",
+    ],
+)
+
+tf_py_test(
+    name = "string_length_op_test",
+    size = "small",
+    srcs = ["string_length_op_test.py"],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:string_ops",
+    ],
+)
+
+tf_py_test(
+    name = "string_lower_op_test",
+    size = "small",
+    srcs = ["string_lower_op_test.py"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
+    ],
+)
+
+tf_py_test(
+    name = "string_split_op_test",
+    size = "small",
+    srcs = ["string_split_op_test.py"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:string_ops",
+        "//tensorflow/python:util",
+        "//tensorflow/python/ops/ragged:ragged_factory_ops",
+        "//tensorflow/python/ops/ragged:ragged_string_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+tf_py_test(
+    name = "string_strip_op_test",
+    size = "small",
+    srcs = ["string_strip_op_test.py"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
+    ],
+)
+
+cuda_py_test(
+    name = "string_to_hash_bucket_op_test",
+    size = "small",
+    srcs = ["string_to_hash_bucket_op_test.py"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:string_ops",
+    ],
+)
+
+cuda_py_test(
+    name = "string_to_number_op_test",
+    size = "small",
+    srcs = ["string_to_number_op_test.py"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:parsing_ops",
+    ],
+)
+
+tf_py_test(
+    name = "string_upper_op_test",
+    size = "small",
+    srcs = ["string_upper_op_test.py"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
+    ],
+)
+
+tf_py_test(
+    name = "substr_op_test",
+    size = "small",
+    srcs = ["substr_op_test.py"],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+tf_py_test(
+    name = "unicode_decode_op_test",
+    size = "small",
+    srcs = ["unicode_decode_op_test.py"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python:string_ops",
+        "//tensorflow/python/eager:context",
+        "//tensorflow/python/ops/ragged",
+        "//tensorflow/python/ops/ragged:ragged_factory_ops",
+        "//tensorflow/python/ops/ragged:ragged_string_ops",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+tf_py_test(
+    name = "unicode_encode_op_test",
+    size = "small",
+    srcs = ["unicode_encode_op_test.py"],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python/ops/ragged:ragged_factory_ops",
+        "//tensorflow/python/ops/ragged:ragged_string_ops",
+        "//tensorflow/python/ops/ragged:ragged_tensor",
+        "//tensorflow/python/ops/ragged:ragged_tensor_value",
+        "//third_party/py/numpy",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+tf_py_test(
+    name = "unicode_script_op_test",
+    size = "small",
+    srcs = ["unicode_script_op_test.py"],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:string_ops",
+    ],
+)
+
+tf_py_test(
+    name = "unicode_transcode_op_test",
+    size = "small",
+    srcs = ["unicode_transcode_op_test.py"],
+    deps = [
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:string_ops",
+        "@absl_py//absl/testing:parameterized",
+    ],
+)
+
+cuda_py_test(
+    name = "unsorted_segment_join_op_test",
+    size = "small",
+    srcs = ["unsorted_segment_join_op_test.py"],
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:string_ops",
+        "//third_party/py/numpy",
+    ],
+)
diff --git a/tensorflow/python/kernel_tests/as_string_op_test.py b/tensorflow/python/kernel_tests/strings_ops/as_string_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/as_string_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/as_string_op_test.py
diff --git a/tensorflow/python/kernel_tests/base64_ops_test.py b/tensorflow/python/kernel_tests/strings_ops/base64_ops_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/base64_ops_test.py
rename to tensorflow/python/kernel_tests/strings_ops/base64_ops_test.py
diff --git a/tensorflow/python/kernel_tests/reduce_join_op_test.py b/tensorflow/python/kernel_tests/strings_ops/reduce_join_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/reduce_join_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/reduce_join_op_test.py
diff --git a/tensorflow/python/kernel_tests/regex_full_match_op_test.py b/tensorflow/python/kernel_tests/strings_ops/regex_full_match_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/regex_full_match_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/regex_full_match_op_test.py
diff --git a/tensorflow/python/kernel_tests/regex_replace_op_test.py b/tensorflow/python/kernel_tests/strings_ops/regex_replace_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/regex_replace_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/regex_replace_op_test.py
diff --git a/tensorflow/python/kernel_tests/string_bytes_split_op_test.py b/tensorflow/python/kernel_tests/strings_ops/string_bytes_split_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/string_bytes_split_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/string_bytes_split_op_test.py
diff --git a/tensorflow/python/kernel_tests/string_format_op_test.py b/tensorflow/python/kernel_tests/strings_ops/string_format_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/string_format_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/string_format_op_test.py
diff --git a/tensorflow/python/kernel_tests/string_join_op_test.py b/tensorflow/python/kernel_tests/strings_ops/string_join_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/string_join_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/string_join_op_test.py
diff --git a/tensorflow/python/kernel_tests/string_length_op_test.py b/tensorflow/python/kernel_tests/strings_ops/string_length_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/string_length_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/string_length_op_test.py
diff --git a/tensorflow/python/kernel_tests/string_lower_op_test.py b/tensorflow/python/kernel_tests/strings_ops/string_lower_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/string_lower_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/string_lower_op_test.py
diff --git a/tensorflow/python/kernel_tests/string_split_op_test.py b/tensorflow/python/kernel_tests/strings_ops/string_split_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/string_split_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/string_split_op_test.py
diff --git a/tensorflow/python/kernel_tests/string_strip_op_test.py b/tensorflow/python/kernel_tests/strings_ops/string_strip_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/string_strip_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/string_strip_op_test.py
diff --git a/tensorflow/python/kernel_tests/string_to_hash_bucket_op_test.py b/tensorflow/python/kernel_tests/strings_ops/string_to_hash_bucket_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/string_to_hash_bucket_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/string_to_hash_bucket_op_test.py
diff --git a/tensorflow/python/kernel_tests/string_to_number_op_test.py b/tensorflow/python/kernel_tests/strings_ops/string_to_number_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/string_to_number_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/string_to_number_op_test.py
diff --git a/tensorflow/python/kernel_tests/string_upper_op_test.py b/tensorflow/python/kernel_tests/strings_ops/string_upper_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/string_upper_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/string_upper_op_test.py
diff --git a/tensorflow/python/kernel_tests/substr_op_test.py b/tensorflow/python/kernel_tests/strings_ops/substr_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/substr_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/substr_op_test.py
diff --git a/tensorflow/python/kernel_tests/unicode_decode_op_test.py b/tensorflow/python/kernel_tests/strings_ops/unicode_decode_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/unicode_decode_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/unicode_decode_op_test.py
diff --git a/tensorflow/python/kernel_tests/unicode_encode_op_test.py b/tensorflow/python/kernel_tests/strings_ops/unicode_encode_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/unicode_encode_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/unicode_encode_op_test.py
diff --git a/tensorflow/python/kernel_tests/unicode_script_op_test.py b/tensorflow/python/kernel_tests/strings_ops/unicode_script_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/unicode_script_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/unicode_script_op_test.py
diff --git a/tensorflow/python/kernel_tests/unicode_transcode_op_test.py b/tensorflow/python/kernel_tests/strings_ops/unicode_transcode_op_test.py
similarity index 99%
rename from tensorflow/python/kernel_tests/unicode_transcode_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/unicode_transcode_op_test.py
index 98ff7e1..01fefa5 100644
--- a/tensorflow/python/kernel_tests/unicode_transcode_op_test.py
+++ b/tensorflow/python/kernel_tests/strings_ops/unicode_transcode_op_test.py
@@ -214,7 +214,6 @@
           replacement_char=ord(" "),
           replace_control_characters=False)
       values = self.evaluate(outputs)
-      print("values=", values)
       self.assertAllEqual(values, expected)
 
   def test_transcode_utf32_to_utf8(self):
diff --git a/tensorflow/python/kernel_tests/unsorted_segment_join_op_test.py b/tensorflow/python/kernel_tests/strings_ops/unsorted_segment_join_op_test.py
similarity index 100%
rename from tensorflow/python/kernel_tests/unsorted_segment_join_op_test.py
rename to tensorflow/python/kernel_tests/strings_ops/unsorted_segment_join_op_test.py