diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/onlyPrivateIsOkForSealedConstructor.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/onlyPrivateIsOkForSealedConstructor.kt
index 76e94cb820be..9a1a7263e5ef 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/onlyPrivateIsOkForSealedConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/onlyPrivateIsOkForSealedConstructor.kt
@@ -1,5 +1,4 @@
 // PROBLEM: none
-// ERROR: Constructor must be private in sealed class
 // COMPILER_ARGUMENTS: -XXLanguage:-SealedInterfaces
 sealed class Foo {
     <caret>protected constructor()
diff --git a/plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectory/expected.xml b/plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectory/expected.xml
index 9738310f34d9..8eaee310394e 100644
--- a/plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectory/expected.xml
+++ b/plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectory/expected.xml
@@ -2,9 +2,10 @@
     <problem>
         <file>barPackageMismatched.kt</file>
         <line>1</line>
-        <module>testPackageDirectoryMismatch_PackageDirectoryMismatch_0</module>
-        <entry_point TYPE="file" FQNAME="barPackageMismatched.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Package name does not match containing directory</problem_class>
+        <module>testMismatchedProjectAndDirectory_MismatchedProjectAndDirectory</module>
+        <package>bar</package>
+        <entry_point TYPE="file" FQNAME="barPackageMismatched.kt"/>
+        <problem_class id="PackageDirectoryMismatch" severity="INFO" attribute_key="INFO_ATTRIBUTES">Package name does not match containing directory</problem_class>
         <description>Package directive does not match the file location</description>
     </problem>
 </problems>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectoryRoot/expected.xml b/plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectoryRoot/expected.xml
index ec3b0fbc0348..3dab46d729ff 100644
--- a/plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectoryRoot/expected.xml
+++ b/plugins/kotlin/idea/tests/testData/multiFileInspections/mismatchedProjectAndDirectoryRoot/expected.xml
@@ -4,7 +4,7 @@
         <line>2</line>
         <module>testMismatchedProjectAndDirectoryRoot_MismatchedProjectAndDirectoryRoot</module>
         <entry_point TYPE="file" FQNAME="rootPackageMatched.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Package name does not match containing directory</problem_class>
+        <problem_class id="PackageDirectoryMismatch" severity="INFO" attribute_key="INFO_ATTRIBUTES">Package name does not match containing directory</problem_class>
         <description>Package directive does not match the file location</description>
     </problem>
 </problems>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/convertToAnonymousObject/hasConcreateMember2.kt b/plugins/kotlin/idea/tests/testData/quickfix/convertToAnonymousObject/hasConcreateMember2.kt
index 1286afe9b880..9fcd07d6c76f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/convertToAnonymousObject/hasConcreateMember2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/convertToAnonymousObject/hasConcreateMember2.kt
@@ -1,5 +1,4 @@
 // "Convert to anonymous object" "true"
-// ERROR: Interfaces cannot initialize supertypes
 interface I0 {
     fun x() {}
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/convertToAnonymousObject/hasConcreateMember2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/convertToAnonymousObject/hasConcreateMember2.kt.after
index f1a96e4ddb39..9ce52f459e2e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/convertToAnonymousObject/hasConcreateMember2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/convertToAnonymousObject/hasConcreateMember2.kt.after
@@ -1,5 +1,4 @@
 // "Convert to anonymous object" "true"
-// ERROR: Interfaces cannot initialize supertypes
 interface I0 {
     fun x() {}
 }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveSealedClassWithImplsToAnotherPackage/conflicts.txt b/plugins/kotlin/idea/tests/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveSealedClassWithImplsToAnotherPackage/conflicts.txt
deleted file mode 100644
index 4e6bd3f2df26..000000000000
--- a/plugins/kotlin/idea/tests/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveSealedClassWithImplsToAnotherPackage/conflicts.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sealed class 'SealedClass' must be moved with all its subclasses
diff --git a/plugins/kotlin/idea/tests/testData/structuralsearch/callExpression/funCallDefaultArgMixed.kt b/plugins/kotlin/idea/tests/testData/structuralsearch/callExpression/funCallDefaultArgMixed.kt
index cb8d67261099..5564c719db23 100644
--- a/plugins/kotlin/idea/tests/testData/structuralsearch/callExpression/funCallDefaultArgMixed.kt
+++ b/plugins/kotlin/idea/tests/testData/structuralsearch/callExpression/funCallDefaultArgMixed.kt
@@ -3,6 +3,6 @@ fun a(k: Int, b: Int = 0, c: String = "Hello World!", d: Double, vararg t: Strin
 fun c() {
     <warning descr="SSR">a(0, 0, "This is test!", 0.0, "Test")</warning>
     <warning descr="SSR">a(0, d = 0.0, t = *<warning descr="[REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_FUNCTION] Redundant spread (*) operator">arrayOf("Test")</warning>)</warning>
-    <warning descr="SSR">a(b = 0, c = "This is a test!", k = 0, <warning descr="[CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS] Arguments execution order is going to be changed in a future release. The expression for named vararg argument will be executed in the order in which it was listed, not at the end. See KT-17691 for more details.">t = *<warning descr="[REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_FUNCTION] Redundant spread (*) operator">arrayOf("Test")</warning></warning>, d = 0.0)</warning>
+    <warning descr="SSR">a(b = 0, c = "This is a test!", k = 0, t = *<warning descr="[REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_FUNCTION] Redundant spread (*) operator">arrayOf("Test")</warning>, d = 0.0)</warning>
     <warning descr="SSR">a(k = 0, d = 0.0, t = *<warning descr="[REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_FUNCTION] Redundant spread (*) operator">arrayOf("Test")</warning>)</warning>
 }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log
index ea02e9ce400a..46f53873474b 100644
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log
+++ b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log
@@ -9,10 +9,8 @@ Cleaning output files:
   out/production/module/OuterClass.class
   out/production/module/UsagePartBKt.class
   out/production/module/Utils.class
-  out/production/module/Utils__PartBKt.class
-End of files
-Cleaning output files:
   out/production/module/Utils__PartAKt.class
+  out/production/module/Utils__PartBKt.class
 End of files
 Compiling files:
   src/partA.kt
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/collections.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/collections.out
index a07e4ba3c26e..256a843209ca 100644
--- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/collections.out
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/collections.out
@@ -5,7 +5,7 @@ Connected to the target VM
 collections.kt:6
 Compile bytecode for arrayListOf(1, 2).map { it.toString() }
 Compile bytecode for arrayListOf(1, 2, 101, 102).filter { it > 100 }
-Compile bytecode for arrayListOf(1, 2).max()
+Compile bytecode for arrayListOf(1, 2).maxOrNull()
 Compile bytecode for arrayListOf(1, 2).count()
 Compile bytecode for arrayListOf(1, 2).size
 Compile bytecode for arrayListOf(1, 2, 3).drop(1)
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/coroutines/capturedReceiverName.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/coroutines/capturedReceiverName.out
index 4370c48eaf04..dabbb0608ae4 100644
--- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/coroutines/capturedReceiverName.out
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/coroutines/capturedReceiverName.out
@@ -7,4 +7,3 @@ capturedReceiverName.kt:22
 Disconnected from the target VM
 
 Process finished with exit code 0
-OK