diff --git a/compiler/fir/resolve/testData/resolve/arguments/incorrectFunctionalType.kt b/compiler/fir/resolve/testData/resolve/arguments/incorrectFunctionalType.kt
index cc93ef073fe..3d8b49c348c 100644
--- a/compiler/fir/resolve/testData/resolve/arguments/incorrectFunctionalType.kt
+++ b/compiler/fir/resolve/testData/resolve/arguments/incorrectFunctionalType.kt
@@ -1,7 +1,7 @@
-fun foo(func: (Int).Int -> Int) {}
+fun foo(func: Int.(Int) -> Int) {}
 
 fun test() {
-    <!INAPPLICABLE_CANDIDATE!>foo<!> {
-        this + <!UNRESOLVED_REFERENCE!>it<!>
+    foo {
+        this + it
     }
 }
\ No newline at end of file
diff --git a/compiler/fir/resolve/testData/resolve/arguments/incorrectFunctionalType.txt b/compiler/fir/resolve/testData/resolve/arguments/incorrectFunctionalType.txt
index 58d453d4b58..a3148f5315d 100644
--- a/compiler/fir/resolve/testData/resolve/arguments/incorrectFunctionalType.txt
+++ b/compiler/fir/resolve/testData/resolve/arguments/incorrectFunctionalType.txt
@@ -1,10 +1,9 @@
 FILE: incorrectFunctionalType.kt
-    public final fun foo(func: R|kotlin/Int.() -> class error: Incomplete code|, Int: <implicit>): R|kotlin/Unit|
-    fun <anonymous>(): R|kotlin/Unit| {
+    public final fun foo(func: R|kotlin/Int.(kotlin/Int) -> kotlin/Int|): R|kotlin/Unit| {
     }
     public final fun test(): R|kotlin/Unit| {
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/foo]>#(<L> = foo@fun <anonymous>(): R|kotlin/String| {
-            this#.R|kotlin/plus|(<Unresolved name: it>#)
+        R|/foo|(<L> = foo@fun R|kotlin/Int|.<anonymous>(it: R|kotlin/Int|): R|kotlin/Int| {
+            this@R|special/anonymous|.R|kotlin/Int.plus|(R|<local>/it|)
         }
         )
     }
diff --git a/compiler/fir/resolve/testData/resolve/multifile/simpleImport.kt b/compiler/fir/resolve/testData/resolve/multifile/simpleImport.kt
index 26d2d379273..e8df73de0e0 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/simpleImport.kt
+++ b/compiler/fir/resolve/testData/resolve/multifile/simpleImport.kt
@@ -1,4 +1,4 @@
-// FILE B.kt
+// FILE: B.kt
 
 package b
 
@@ -10,7 +10,7 @@ fun I() {}
 interface I {}
 
 
-// FILE A.kt
+// FILE: A.kt
 
 package a
 import b.MyClass
diff --git a/compiler/fir/resolve/testData/resolve/multifile/simpleImport.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleImport.txt
index d776d1e0291..3b4d27cad9b 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/simpleImport.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/simpleImport.txt
@@ -1,4 +1,4 @@
-FILE: simpleImport.kt
+FILE: B.kt
     public abstract class MyClass : R|kotlin/Any| {
         public constructor(): R|b/MyClass| {
             super<R|kotlin/Any|>()
@@ -11,8 +11,9 @@ FILE: simpleImport.kt
     }
     public abstract interface I : R|kotlin/Any| {
     }
+FILE: A.kt
     public final class YourClass : R|b/MyClass| {
-        public constructor(): R|b/YourClass| {
+        public constructor(): R|a/YourClass| {
             super<R|b/MyClass|>()
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.kt b/compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.kt
index 8b6367438eb..0f784539789 100644
--- a/compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.kt
+++ b/compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.kt
@@ -1,4 +1,4 @@
-7class U {
+class U {
     operator fun contains(g: String): Boolean {
         return false
     }