diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughUntilDefaultaAssignment.java b/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughDefaultAssignment.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionMigration/afterThroughUntilDefaultaAssignment.java
rename to java/java-tests/testData/inspection/switchExpressionMigration/afterThroughDefaultAssignment.java
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughDefaultReturn.java b/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughDefaultReturn.java
new file mode 100644
index 000000000000..203289124f1f
--- /dev/null
+++ b/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughDefaultReturn.java
@@ -0,0 +1,18 @@
+// "Replace with 'switch' expression" "true-preview"
+
+class ThroughUntilDefaultReturn {
+
+  static enum Letter {
+    A,
+    B,
+    C,
+    D
+  }
+
+  private static int test(Letter letter) {
+      return switch (letter) {
+          case A -> 1;
+          default -> 2;
+      };
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughUntilDefaultaStatement.java b/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughDefaultStatement.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionMigration/afterThroughUntilDefaultaStatement.java
rename to java/java-tests/testData/inspection/switchExpressionMigration/afterThroughDefaultStatement.java
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughUntilDefaultAssignment.java b/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughUntilDefaultAssignment.java
new file mode 100644
index 000000000000..ac1ee0ad07f7
--- /dev/null
+++ b/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughUntilDefaultAssignment.java
@@ -0,0 +1,18 @@
+// "Replace with 'switch' expression" "true-preview"
+
+class ThroughUntilDefaultaAssignment {
+
+  static enum Letter {
+    A,
+    B,
+    C,
+    D
+  }
+
+  private static void test(Letter letter) {
+    int i = switch (letter) {
+        case A -> 2;
+        default -> 3;
+    };
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughUntilDefaultStatement.java b/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughUntilDefaultStatement.java
new file mode 100644
index 000000000000..c5610204f706
--- /dev/null
+++ b/java/java-tests/testData/inspection/switchExpressionMigration/afterThroughUntilDefaultStatement.java
@@ -0,0 +1,18 @@
+// "Replace with enhanced 'switch' statement" "true-preview"
+
+class ThroughUntilDefaultaAssignment {
+
+  static enum Letter {
+    A,
+    B,
+    C,
+    D
+  }
+
+  private static void test(Letter letter) {
+      switch (letter) {
+          case A -> System.out.println("1");
+          default -> System.out.println(2);
+      }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughDefaultAssignment.java b/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughDefaultAssignment.java
new file mode 100644
index 000000000000..e0a1d1c9fa32
--- /dev/null
+++ b/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughDefaultAssignment.java
@@ -0,0 +1,23 @@
+// "Replace with 'switch' expression" "true-preview"
+
+class ThroughUntilDefaultaAssignment {
+
+  static enum Letter {
+    A,
+    B,
+    C,
+    D
+  }
+
+  private static void test(Letter letter) {
+    int i = 1;
+    switch<caret> (letter) {
+      case A:
+        i = 2;
+        break;
+      default:
+      case B:
+          i = 3;
+    }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughDefaultReturn.java b/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughDefaultReturn.java
new file mode 100644
index 000000000000..10fbb9164c12
--- /dev/null
+++ b/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughDefaultReturn.java
@@ -0,0 +1,21 @@
+// "Replace with 'switch' expression" "true-preview"
+
+class ThroughUntilDefaultReturn {
+
+  static enum Letter {
+    A,
+    B,
+    C,
+    D
+  }
+
+  private static int test(Letter letter) {
+      switch<caret> (letter) {
+        case A:
+          return 1;
+        default:
+        case B:
+          return 2;
+      }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughDefaultStatement.java b/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughDefaultStatement.java
new file mode 100644
index 000000000000..f3fae63fee30
--- /dev/null
+++ b/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughDefaultStatement.java
@@ -0,0 +1,22 @@
+// "Replace with enhanced 'switch' statement" "true-preview"
+
+class ThroughUntilDefaultaAssignment {
+
+  static enum Letter {
+    A,
+    B,
+    C,
+    D
+  }
+
+  private static void test(Letter letter) {
+    switch<caret> (letter) {
+      case A:
+        System.out.println("1");
+        break;
+      default:
+      case B:
+          System.out.println(2);
+    }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughUntilDefaultaAssignment.java b/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughUntilDefaultAssignment.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughUntilDefaultaAssignment.java
rename to java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughUntilDefaultAssignment.java
diff --git a/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughUntilDefaultaStatement.java b/java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughUntilDefaultStatement.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughUntilDefaultaStatement.java
rename to java/java-tests/testData/inspection/switchExpressionMigration/beforeThroughUntilDefaultStatement.java