diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt
index 17c6e62dbff..286057c136b 100644
--- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt
+++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt
@@ -8,6 +8,7 @@ Module 'module1' production
     experimental-format-version.txt
     format-version.txt
     class-fq-name-to-source.tab
+    internal-name-to-source.tab
     proto.tab
     source-to-classes.tab
 Module 'module1' tests
@@ -15,6 +16,7 @@ Module 'module2' production
     experimental-format-version.txt
     format-version.txt
     class-fq-name-to-source.tab
+    internal-name-to-source.tab
     package-parts.tab
     proto.tab
     source-to-classes.tab
@@ -25,6 +27,7 @@ Module 'module3' production
     experimental-format-version.txt
     format-version.txt
     class-fq-name-to-source.tab
+    internal-name-to-source.tab
     proto.tab
     source-to-classes.tab
 Module 'module3' tests
@@ -32,6 +35,7 @@ Module 'module4' production
     experimental-format-version.txt
     format-version.txt
     class-fq-name-to-source.tab
+    internal-name-to-source.tab
     proto.tab
     source-to-classes.tab
 Module 'module4' tests
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt
index 76de4a21c66..f5cb5275720 100644
--- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt
+++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt
@@ -7,6 +7,7 @@ kotlin-data-container
 Module 'module1' production
     experimental-format-version.txt
     format-version.txt
+    internal-name-to-source.tab
     package-parts.tab
     proto.tab
     source-to-classes.tab
@@ -14,6 +15,7 @@ Module 'module1' tests
 Module 'module2' production
     experimental-format-version.txt
     format-version.txt
+    internal-name-to-source.tab
     package-parts.tab
     proto.tab
     source-to-classes.tab
@@ -21,6 +23,7 @@ Module 'module2' tests
 Module 'module3' production
     experimental-format-version.txt
     format-version.txt
+    internal-name-to-source.tab
     package-parts.tab
     proto.tab
     source-to-classes.tab
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log
new file mode 100644
index 00000000000..2c5aa067235
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log
@@ -0,0 +1,52 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/B.class
+End of files
+Compiling files:
+  src/B.kt
+End of files
+Marked as dirty by Kotlin:
+  src/C.kt
+  src/getListOfB.kt
+  src/getListOfC.kt
+  src/useListOfAWithListOfB.kt
+  src/useListOfAWithListOfC.kt
+Exit code: ADDITIONAL_PASS_REQUIRED
+------------------------------------------
+Cleaning output files:
+  out/production/module/C.class
+  out/production/module/GetListOfBKt.class
+  out/production/module/GetListOfCKt.class
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/UseListOfAWithListOfBKt.class
+  out/production/module/UseListOfAWithListOfCKt.class
+End of files
+Compiling files:
+  src/C.kt
+  src/getListOfB.kt
+  src/getListOfC.kt
+  src/useListOfAWithListOfB.kt
+  src/useListOfAWithListOfC.kt
+End of files
+Exit code: ABORT
+------------------------------------------
+COMPILATION FAILED
+Type mismatch: inferred type is List<B> but List<A> was expected
+Type mismatch: inferred type is List<C> but List<A> was expected
+
+================ Step #2 =================
+
+Cleaning output files:
+  out/production/module/B.class
+End of files
+Compiling files:
+  src/B.kt
+  src/C.kt
+  src/getListOfB.kt
+  src/getListOfC.kt
+  src/useListOfAWithListOfB.kt
+  src/useListOfAWithListOfC.kt
+End of files
+Exit code: OK
+------------------------------------------
diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt
index 0889bb8f6ae..bf5b0abf716 100644
--- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt
+++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt
@@ -8,6 +8,7 @@ Module 'module' production
     experimental-format-version.txt
     format-version.txt
     class-fq-name-to-source.tab
+    internal-name-to-source.tab
     proto.tab
     source-to-classes.tab
 Module 'module' tests
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt
index 700ec2032f6..076178b6fc5 100644
--- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt
+++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt
@@ -8,6 +8,7 @@ Module 'module' production
     experimental-format-version.txt
     format-version.txt
     class-fq-name-to-source.tab
+    internal-name-to-source.tab
     proto.tab
     source-to-classes.tab
     subtypes.tab
diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt
index dcd8748a3fa..093875fd5ed 100644
--- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt
+++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt
@@ -8,7 +8,8 @@ Module 'module' production
     experimental-format-version.txt
     format-version.txt
     constants.tab
+    internal-name-to-source.tab
     package-parts.tab
     proto.tab
     source-to-classes.tab
-Module 'module' tests
+Module 'module' tests
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt
index 670ef919aaa..14f66d6ef09 100644
--- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt
+++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt
@@ -7,7 +7,8 @@ kotlin-data-container
 Module 'module' production
     experimental-format-version.txt
     format-version.txt
+    internal-name-to-source.tab
     package-parts.tab
     proto.tab
     source-to-classes.tab
-Module 'module' tests
+Module 'module' tests
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt
index 36458852656..a33c2237216 100644
--- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt
+++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt
@@ -8,6 +8,7 @@ Module 'module' production
     experimental-format-version.txt
     format-version.txt
     inline-functions.tab
+    internal-name-to-source.tab
     package-parts.tab
     proto.tab
     source-to-classes.tab
diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt
index b947e922a24..a33c2237216 100644
--- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt
+++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt
@@ -8,7 +8,8 @@ Module 'module' production
     experimental-format-version.txt
     format-version.txt
     inline-functions.tab
+    internal-name-to-source.tab
     package-parts.tab
     proto.tab
     source-to-classes.tab
-Module 'module' tests
+Module 'module' tests
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt
index 670ef919aaa..14f66d6ef09 100644
--- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt
+++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt
@@ -7,7 +7,8 @@ kotlin-data-container
 Module 'module' production
     experimental-format-version.txt
     format-version.txt
+    internal-name-to-source.tab
     package-parts.tab
     proto.tab
     source-to-classes.tab
-Module 'module' tests
+Module 'module' tests
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log
new file mode 100644
index 00000000000..3d440011e9b
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log
@@ -0,0 +1,12 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/baz/AKt.class
+  out/production/module/baz/Foo.class
+End of files
+Compiling files:
+  src/bar/a.kt
+End of files
+Exit code: OK
+------------------------------------------
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/gradle-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/gradle-build.log
new file mode 100644
index 00000000000..32399a71bd8
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/gradle-build.log
@@ -0,0 +1,8 @@
+================ Step #1 =================
+
+Compiling files:
+  src/a.kt
+  src/b.kt
+End of files
+Exit code: OK
+------------------------------------------
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/gradle-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/gradle-build.log
new file mode 100644
index 00000000000..32399a71bd8
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/gradle-build.log
@@ -0,0 +1,8 @@
+================ Step #1 =================
+
+Compiling files:
+  src/a.kt
+  src/b.kt
+End of files
+Exit code: OK
+------------------------------------------
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/dummy.kt
new file mode 100644
index 00000000000..9448caad874
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/dummy.kt
@@ -0,0 +1,3 @@
+package foo
+
+fun dummy() {}
\ No newline at end of file