diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.fir.txt
index 9e6cf075d09..6a3ad07d1b3 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.fir.txt
@@ -37,8 +37,8 @@ FILE: destructuring.kt
         }
         )
         R|/foo1|(<L> = foo1@fun <anonymous>(<destruct>: R|C|): R|kotlin/Unit| <inline=NoInline>  {
-            lval x: R|kotlin/String| = R|<local>/<destruct>|.R|/C.component1|()
-            lval y: R|kotlin/Int| = R|<local>/<destruct>|.R|/C.component2|()
+            lval x: R|kotlin/String| = R|<local>/<destruct>|.<CS errors: /C.component1>#()
+            lval y: R|kotlin/Int| = R|<local>/<destruct>|.<CS errors: /C.component2>#()
             <Inapplicable(INAPPLICABLE): /C.C>#(R|<local>/x|, R|<local>/y|)
         }
         )
@@ -59,10 +59,10 @@ FILE: destructuring.kt
         }
         )
         R|/foo2|(<L> = foo2@fun <anonymous>(<destruct>: R|C|, <destruct>: R|C|): R|kotlin/Unit| <inline=NoInline>  {
-            lval x: R|kotlin/String| = R|<local>/<destruct>|.R|/C.component1|()
-            lval y: R|kotlin/Int| = R|<local>/<destruct>|.R|/C.component2|()
-            lval z: R|kotlin/String| = R|<local>/<destruct>|.R|/C.component1|()
-            lval w: R|kotlin/Int| = R|<local>/<destruct>|.R|/C.component2|()
+            lval x: R|kotlin/String| = R|<local>/<destruct>|.<CS errors: /C.component1>#()
+            lval y: R|kotlin/Int| = R|<local>/<destruct>|.<CS errors: /C.component2>#()
+            lval z: R|kotlin/String| = R|<local>/<destruct>|.<CS errors: /C.component1>#()
+            lval w: R|kotlin/Int| = R|<local>/<destruct>|.<CS errors: /C.component2>#()
             <Inapplicable(INAPPLICABLE): /C.C>#(R|<local>/x|.R|kotlin/String.plus|(R|<local>/z|), R|<local>/y|.R|kotlin/Int.plus|(R|<local>/w|))
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt
index 21a88f6c732..bb9a26cbb16 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt
@@ -7,7 +7,7 @@ FILE: main.kt
     public abstract interface PsiClass : R|kotlin/Any| {
     }
     public final fun test(): R|kotlin/Unit| {
-        lval processor: R|AdapterProcessor<ft<PsiMethod, PsiMethod?>, ft<PsiClass, PsiClass?>>| = R|/AdapterProcessor.AdapterProcessor|<R|ft<PsiMethod, PsiMethod?>|, R|ft<PsiClass, PsiClass?>|>(R|/Function|<R|ft<PsiMethod, PsiMethod?>|, R|PsiClass?|>(<L> = Function@fun <anonymous>(method: R|PsiMethod?|): R|PsiClass?| <inline=NoInline>  {
+        lval processor: R|AdapterProcessor<ft<PsiMethod, PsiMethod?>, ft<PsiClass, PsiClass?>>| = R|/AdapterProcessor.AdapterProcessor|<R|ft<PsiMethod, PsiMethod?>|, R|ft<PsiClass, PsiClass?>|>(R|/Function|<R|ft<PsiMethod, PsiMethod?>|, R|ft<PsiClass, PsiClass?>|>(<L> = Function@fun <anonymous>(method: R|PsiMethod?|): R|ft<PsiClass, PsiClass?>| <inline=NoInline>  {
             ^ R|<local>/method|?.{ $subj$.R|/PsiMethod.containingClass| }
         }
         ))
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.fir.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.fir.txt
index 68989da9f2a..0a81a199ef7 100644
--- a/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.fir.txt
@@ -26,7 +26,7 @@ FILE: kt41982.kt
             super<R|DelegateProvider<kotlin/Any>|>()
         }
 
-        public final var start: R|kotlin/Long|by this@R|/Test|.R|/long|<R|Test?|, R|Test?|>(<L> = long@fun <anonymous>(): R|kotlin/Long?| <inline=NoInline>  {
+        public final var start: R|kotlin/Long|by this@R|/Test|.R|/long|<R|Test|, R|Test|>(<L> = long@fun <anonymous>(): R|kotlin/Long?| <inline=NoInline>  {
             ^ Long(0)
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/multipleBounds.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/multipleBounds.fir.txt
index 8664ca97613..b52b8c689f3 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/multipleBounds.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/multipleBounds.fir.txt
@@ -59,8 +59,8 @@ FILE: multipleBounds.kt
 
     }
     public final fun test(): R|kotlin/Unit| {
-        R|Jet87/Test1.Test1|<R|Jet87/B|>()
-        R|Jet87/Test1.Test1|<R|Jet87/A|>()
+        <CS errors: Jet87/Test1.Test1>#<R|Jet87/B|>()
+        <CS errors: Jet87/Test1.Test1>#<R|Jet87/A|>()
         R|Jet87/Test1.Test1|<R|Jet87/C|>()
     }
     public final class Foo : R|kotlin/Any| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.fir.txt
index 17a10ed869c..f4728911923 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.fir.txt
@@ -180,7 +180,7 @@ FILE: returnTypeMismatchOnOverride.kt
         }
 
         public open fun kek(): R|Z| {
-            ^kek R|/Z.Z|()
+            ^kek <CS errors: /Z.Z>#()
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt
index 5cb34d28b71..0595a0eec0b 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt
@@ -11,7 +11,7 @@ FILE: typeArgumentsNotAllowed.kt
 
     }
     public final fun <T> foo(): R|kotlin/Unit| {
-        R|rest/bar|<<ERROR TYPE REF: Type arguments not allowed>>()
+        <CS errors: rest/bar>#<<ERROR TYPE REF: Type arguments not allowed>>()
         R|rest/bar|<R|kotlin/collections/List<kotlin/collections/List<ERROR CLASS: Type arguments not allowed>>|>()
     }
     public final fun <T> bar(): R|kotlin/Unit| {
@@ -42,7 +42,7 @@ FILE: typeArgumentsNotAllowed.kt
     }
     public final fun <T> fest(): R|kotlin/Unit| {
         lval b: R|kotlin/collections/List<ERROR CLASS: Type arguments not allowed>|
-        R|rest/gest|<<ERROR TYPE REF: Type arguments not allowed>>()
+        <CS errors: rest/gest>#<<ERROR TYPE REF: Type arguments not allowed>>()
         R|rest/gest|<R|T|>()
         lval c: R|kotlin/collections/List<kotlin/collections/List<kotlin/collections/List<ERROR CLASS: Type arguments not allowed>>>|
         R|rest/gest|<R|kotlin/collections/List<kotlin/collections/List<ERROR CLASS: Type arguments not allowed>>|>()
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.fir.txt
index 65924bdae96..42852b2085a 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.fir.txt
@@ -19,15 +19,15 @@ FILE: upperBoundViolated.kt
     public final fun <T : R|A|> fest(): R|kotlin/Unit| {
     }
     public final fun test(): R|kotlin/Unit| {
-        lval b1: R|B<kotlin/Int>| = R|/B.B|<R|kotlin/Int|>()
+        lval b1: R|B<kotlin/Int>| = <CS errors: /B.B>#<R|kotlin/Int|>()
         lval b2: R|B<C>| = R|/B.B|<R|C|>()
-        lval b3: R|B<kotlin/Any?>| = R|/B.B|<R|kotlin/Any?|>()
-        lval b4: <ERROR TYPE REF: Unresolved name: NumberPhile> = R|/B.B|<<ERROR TYPE REF: Symbol not found for UnexistingType>>().<Unresolved name: NL>#(ERROR_EXPR(No right operand)).<Unresolved name: Int>#(<Call has no callee>#()).<Unresolved name: NumberPhile>#(ERROR_EXPR(No right operand))
-        lval b5: R|B<B<ERROR CLASS: Symbol not found for UnexistingType>>| = R|/B.B|<R|B<ERROR CLASS: Symbol not found for UnexistingType>|>()
-        R|/fest|<R|kotlin/Boolean|>()
+        lval b3: R|B<kotlin/Any?>| = <CS errors: /B.B>#<R|kotlin/Any?|>()
+        lval b4: <ERROR TYPE REF: Unresolved name: NumberPhile> = <CS errors: /B.B>#<<ERROR TYPE REF: Symbol not found for UnexistingType>>().<Unresolved name: NL>#(ERROR_EXPR(No right operand)).<Unresolved name: Int>#(<Call has no callee>#()).<Unresolved name: NumberPhile>#(ERROR_EXPR(No right operand))
+        lval b5: R|B<B<ERROR CLASS: Symbol not found for UnexistingType>>| = <CS errors: /B.B>#<R|B<ERROR CLASS: Symbol not found for UnexistingType>|>()
+        <CS errors: /fest>#<R|kotlin/Boolean|>()
         R|/fest|<R|C|>()
         R|/fest|<R|C|>()
-        R|/fest|<R|B<C>|>()
+        <CS errors: /fest>#<R|B<C>|>()
     }
     public open class S<F, G : R|F|> : R|kotlin/Any| {
         public constructor<F, G : R|F|>(): R|S<F, G>| {
@@ -46,8 +46,8 @@ FILE: upperBoundViolated.kt
         lval o2: R|S<K, K>| = R|/S.S|<R|K|, R|K|>()
         lval o3: R|S<L, L>| = R|/S.S|<R|L|, R|L|>()
         lval o4: R|S<S<K, L>, T<K, L>>| = R|/S.S|<R|S<K, L>|, R|T<K, L>|>()
-        lval o5: R|S<S<K, L>, T<K, K>>| = R|/S.S|<R|S<K, L>|, R|T<K, K>|>()
-        lval o5: R|S<S<L, L>, T<K, L>>| = R|/S.S|<R|S<L, L>|, R|T<K, L>|>()
+        lval o5: R|S<S<K, L>, T<K, K>>| = <CS errors: /S.S>#<R|S<K, L>|, R|T<K, K>|>()
+        lval o5: R|S<S<L, L>, T<K, L>>| = <CS errors: /S.S>#<R|S<L, L>|, R|T<K, L>|>()
         lval o6: R|S<kotlin/Any, T<S<K, L>, kotlin/String>>| = R|/S.S|<R|kotlin/Any|, R|T<S<K, L>, kotlin/String>|>()
         lval o7: R|S<kotlin/Any, T<S<K, L>, kotlin/Nothing>>| = R|/S.S|<R|kotlin/Any|, R|T<S<K, L>, kotlin/Nothing>|>()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.fir.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.fir.txt
index 5c250b98f39..aa26237421d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.fir.txt
@@ -1,5 +1,5 @@
 FILE: mutableList.kt
     public final fun foo(): R|kotlin/Unit| {
         lvar listVar: R|kotlin/collections/MutableList<kotlin/Int>| = R|kotlin/collections/mutableListOf|<R|kotlin/Int|>(vararg(Int(1), Int(2), Int(3)))
-        R|<local>/listVar| = R|<local>/listVar|.R|kotlin/collections/plus|<R|kotlin/Int|>(Int(4))
+        R|<local>/listVar| = R|<local>/listVar|.<CS errors: kotlin/collections/plus>#<R|kotlin/Int|>(Int(4))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/functionReturnTypeMismatchChecker/basic.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/functionReturnTypeMismatchChecker/basic.fir.txt
index 438b5ffeca3..59b640f535c 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/functionReturnTypeMismatchChecker/basic.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/functionReturnTypeMismatchChecker/basic.fir.txt
@@ -20,7 +20,7 @@ FILE: basic.kt
         ^okOneLineFunction Int(10).R|kotlin/Int.plus|(Int(1))
     }
     public final fun errorOneLineFunction(): R|kotlin/String| {
-        ^errorOneLineFunction Int(10).R|kotlin/Int.plus|(Int(1))
+        ^errorOneLineFunction Int(10).<CS errors: kotlin/Int.plus>#(Int(1))
     }
     public final class A : R|kotlin/Any| {
         public constructor(): R|A| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.fir.txt
index e469b85bf08..a8a32925ec9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.fir.txt
@@ -19,8 +19,8 @@ FILE: KtFirCompositeScope.kt
 
         public final fun getAllNames(): R|kotlin/collections/Set<kotlin/String>| {
             ^getAllNames R|/withValidityAssertion|<R|kotlin/collections/Set<kotlin/String>|>(<L> = withValidityAssertion@fun <anonymous>(): R|kotlin/collections/Set<kotlin/String>| <inline=Inline, kind=UNKNOWN>  {
-                ^ R|/buildSet|<R|kotlin/Any?|>(<L> = buildSet@fun R|kotlin/collections/MutableSet<kotlin/Any?>|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-                    this@R|/KtFirCompositeScope|.R|/KtFirCompositeScope.subScopes|.R|kotlin/collections/flatMapTo|<R|KtScope|, R|kotlin/String|, R|it(kotlin/Unit & kotlin/collections/MutableCollection<in kotlin/String>)|>(this@R|special/anonymous|, <L> = flatMapTo@fun <anonymous>(it: R|KtScope|): R|kotlin/collections/Iterable<kotlin/String>| <inline=Inline, kind=UNKNOWN>  {
+                ^ R|/buildSet|<R|kotlin/String|>(<L> = buildSet@fun R|kotlin/collections/MutableSet<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
+                    this@R|/KtFirCompositeScope|.R|/KtFirCompositeScope.subScopes|.R|kotlin/collections/flatMapTo|<R|KtScope|, R|kotlin/String|, R|kotlin/collections/MutableCollection<in kotlin/String>|>(this@R|special/anonymous|, <L> = flatMapTo@fun <anonymous>(it: R|KtScope|): R|kotlin/collections/Iterable<kotlin/String>| <inline=Inline, kind=UNKNOWN>  {
                         ^ R|<local>/it|.R|/KtScope.getAllNames|()
                     }
                     )