diff --git a/idea/idea-fir/testData/highlighterFir/consturctor.kt b/idea/idea-fir/testData/highlighterFir/consturctor.kt
index 514afd04204..e4c69f1a696 100644
--- a/idea/idea-fir/testData/highlighterFir/consturctor.kt
+++ b/idea/idea-fir/testData/highlighterFir/consturctor.kt
@@ -1,3 +1,3 @@
-class A : X {
-    private val x = B(this)
+class <info descr="null">A</info> : <info descr="null">X</info> {
+    <info descr="null">private</info> val <info descr="null">x</info> = <info descr="null">B</info>(this)
 }
\ No newline at end of file
diff --git a/idea/idea-fir/testData/highlighterFir/extensionProperty.kt b/idea/idea-fir/testData/highlighterFir/extensionProperty.kt
index 8a7b902e88b..0470f4466b9 100644
--- a/idea/idea-fir/testData/highlighterFir/extensionProperty.kt
+++ b/idea/idea-fir/testData/highlighterFir/extensionProperty.kt
@@ -1,3 +1,3 @@
-class C(val a: A) {
-    val e = a.extension
+class <info descr="null">C</info>(val <info descr="null">a</info>: <info descr="null">A</info>) {
+    val <info descr="null">e</info> = <info descr="null">a</info>.<info descr="null">extension</info>
 }
\ No newline at end of file
diff --git a/idea/idea-fir/testData/highlighterFir/withCall.kt b/idea/idea-fir/testData/highlighterFir/withCall.kt
index 606ccd67dbf..fe6b0406172 100644
--- a/idea/idea-fir/testData/highlighterFir/withCall.kt
+++ b/idea/idea-fir/testData/highlighterFir/withCall.kt
@@ -1,8 +1,8 @@
-class B {
-    fun q(): C {}
-    private val y = q()
+class <info descr="null">B</info> {
+    fun <info descr="null">q</info>(): <info descr="null">C</info> {}
+    <info descr="null">private</info> val <info descr="null">y</info> = <info descr="null">q</info>()
 
-    fun foo(a: A) = with(a) {
-        bar("a", y)
+    fun <info descr="null">foo</info>(<info descr="null">a</info>: <info descr="null">A</info>) = <info descr="null">with</info>(<info descr="null">a</info>) {
+        <info descr="null">bar</info>("a", <info descr="null">y</info>)
     }
 }
\ No newline at end of file