diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/base_message.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/base_message.proto
index 74b7f1e1dac..bc664b1e9c5 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/base_message.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/base_message.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message Base {
   repeated int64 arr = 1;
   bool flag = 5;
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/connect.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/connect.proto
index e587cbff293..54d70e3c15c 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/connect.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/connect.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message ConnectionRequest {
     repeated int32 ip = 1;
     int32 port = 2;
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/cross_branch.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/cross_branch.proto
index 46d57657256..b6fcb03c7d0 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/cross_branch.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/cross_branch.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message CrossBranch {
   message Grandfather {
     message LeftFather {
@@ -20,6 +22,11 @@ message CrossBranch {
       message RightRightSon {
         Grandfather.LeftFather.LeftRightSon son_field = 1;
       }
+
+      RightLeftSon rls = 1;
+      RightRightSon rrs = 2;
     }
+
+    RightFather rf = 1;
   }
 }
\ No newline at end of file
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/direction.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/direction.proto
index 7d89ce9384e..3aadd316156 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/direction.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/direction.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message DirectionRequest {
     enum Command {
         stop = 0;
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/extended_message.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/extended_message.proto
index 67d7928526c..c9a6bc88b4a 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/extended_message.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/extended_message.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message Extended {
   repeated int64 arr = 1;
   int64 long = 6;
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/location.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/location.proto
index 6bd1f2bc890..1cddfcc4a71 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/location.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/location.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message LocationResponse {
 
     LocationData locationResponseData = 1;
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/max_tag_val.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/max_tag_val.proto
deleted file mode 100644
index f90dc140adf..00000000000
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/max_tag_val.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-syntax = "proto3";
-
-message MaxTagVal {
-  int32 int = 536870911;
-
-  repeated sint64 slong_array = 536870910;
-
-  sint32 sint = 536870909;
-
-  enum Enum {
-    first_val = 0;
-    second_val = 536870907;
-  }
-
-  Enum enum_field = 536870907;
-}
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/multiple_messages.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/multiple_messages.proto
index f10ab428524..a4b24c97ed8 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/multiple_messages.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/multiple_messages.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message FirstMessage {
   int32 int_field = 1;
 }
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/nested_messaged.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/nested_messaged.proto
deleted file mode 100644
index 4e6c5c07cf7..00000000000
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/nested_messaged.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-syntax = "proto3";
-
-message NestedMessage {
-	message Grandfather {
-	  message Father {
-	    message Son {
-	      int32 son_field = 1;
-	    }
-
-	    Son first_son = 1;
-	    Son second_son = 2;
-	  }
-
-	  Father first_father = 1;
-	  Father second_father = 2;
-	}
-}
\ No newline at end of file
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/rc_session.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/rc_session.proto
deleted file mode 100644
index 8087894ac26..00000000000
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/rc_session.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-syntax = "proto3";
-
-//session up request is empty. only URL
-message SessionUpResponse {
-    int32 code = 1;
-    int32 errorMsg = 2;
-    int32 sid = 3;
-}
-
-message SessionDownResponse {
-    int32 code = 1;
-    int32 errorMsg = 2;
-}
-
-message SessionDownRequest {
-    int32 sid = 1;
-}
-
-message HeartBeatRequest {
-    int32 sid = 1;
-}
-
-message HeartBeatResponse {
-    int32 code = 1;
-    int32 errorMsg = 2;
-}
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_varints.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_varints.proto
index 06ac565616a..f5854c50857 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_varints.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_varints.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message MessageRepeatedVarints {
   repeated int32 int = 1;
   repeated int64 long = 2;
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_zigzag.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_zigzag.proto
index 06f685fd349..8cd34991d49 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_zigzag.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/repeated_zigzag.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message MessageRepeatedZigZag {
   repeated sint32 int = 1;
   repeated sint64 long = 2;
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/route.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/route.proto
deleted file mode 100644
index c84c7191588..00000000000
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/route.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-message RouteRequest {
-    repeated int32 dinstances = 1; 
-    repeated int32 angle_deltas = 2;
-}
-
-message RouteResponse {
-    int32 code = 1;
-    int32 errorMsg = 2;
-}
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/route_done.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/route_done.proto
deleted file mode 100644
index 6b968c9b99b..00000000000
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/route_done.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-syntax = "proto3";
-
-message RouteDoneResponse {
-    int32 code = 1;
-    int32 errorMsg = 2;
-}
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/tag_order.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/tag_order.proto
index 830edd59a93..469183718a7 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/tag_order.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/tag_order.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message TagOrder {
   int32 int = 3423;
   repeated sint64 slong_array = 12321;
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/tag_order_shuffled.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/tag_order_shuffled.proto
index 7a626786138..1239b1ea126 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/tag_order_shuffled.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/tag_order_shuffled.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message TagOrderShuffled {
   sint32 sint = 8;
   Enum enum_field = 938423;
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/varints.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/varints.proto
index e1e9f997f9f..6f4626936a3 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/varints.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/varints.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message MessageVarints {
   int32 int = 1;
   int64 long = 2;
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/zigzag.proto b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/zigzag.proto
index 9ca7fddad33..38e6b7afc9c 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/zigzag.proto
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/test/zigzag.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option java_package = "java_msg";
+
 message MessageZigZag {
   sint32 int = 1;
   sint64 long = 2;