diff --git a/compiler/visualizer/testData/rawBuilder/declarations/annotation.kt b/compiler/visualizer/testData/rawBuilder/declarations/annotation.kt
index 54faea45768..d92c3b6449f 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/annotation.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/annotation.kt
@@ -1,9 +1,36 @@
 // FIR_IGNORE
 //constructor annotation/Target(vararg annotation/AnnotationTarget)
-//│     enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
-//│     │                enum entry annotation/AnnotationTarget.ANNOTATION_CLASS
-//│     │                │
-@Target(AnnotationTarget.ANNOTATION_CLASS) annotation class base
+//│
+@Target(
+//  enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
+//  │                enum entry annotation/AnnotationTarget.CLASS
+//  │                │
+    AnnotationTarget.CLASS,
+//  enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
+//  │                enum entry annotation/AnnotationTarget.PROPERTY
+//  │                │
+    AnnotationTarget.PROPERTY,
+//  enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
+//  │                enum entry annotation/AnnotationTarget.LOCAL_VARIABLE
+//  │                │
+    AnnotationTarget.LOCAL_VARIABLE,
+//  enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
+//  │                enum entry annotation/AnnotationTarget.VALUE_PARAMETER
+//  │                │
+    AnnotationTarget.VALUE_PARAMETER,
+//  enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
+//  │                enum entry annotation/AnnotationTarget.CONSTRUCTOR
+//  │                │
+    AnnotationTarget.CONSTRUCTOR,
+//  enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
+//  │                enum entry annotation/AnnotationTarget.FUNCTION
+//  │                │
+    AnnotationTarget.FUNCTION,
+//  enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
+//  │                enum entry annotation/AnnotationTarget.TYPE
+//  │                │
+    AnnotationTarget.TYPE
+) annotation class base
 
 //constructor base()
 //│
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/functionTypes.kt b/compiler/visualizer/testData/rawBuilder/declarations/functionTypes.kt
index 7982bab6391..689c05978e3 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/functionTypes.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/functionTypes.kt
@@ -1,8 +1,7 @@
 // FIR_IGNORE
-//                                      Unit
-//                                      │ fun ((T) -> Unit).invoke(T): Unit
-//                                      │ │
-fun <T> simpleRun(f: (T) -> Unit): Unit = f()
+//                               T fun (() -> T).invoke(): T
+//                               │ │
+fun <T> simpleRun(f: () -> T): T = f()
 
 //         collections/List<T>
 //         │
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/annotated.kt b/compiler/visualizer/testData/rawBuilder/expressions/annotated.kt
index 95d250bfca2..f55378e6240 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/annotated.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/annotated.kt
@@ -2,8 +2,10 @@
 //constructor annotation/Target(vararg annotation/AnnotationTarget)
 //│     enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
 //│     │                enum entry annotation/AnnotationTarget.EXPRESSION
-//│     │                │
-@Target(AnnotationTarget.EXPRESSION)
+//│     │                │           enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
+//│     │                │           │                enum entry annotation/AnnotationTarget.LOCAL_VARIABLE
+//│     │                │           │                │
+@Target(AnnotationTarget.EXPRESSION, AnnotationTarget.LOCAL_VARIABLE)
 //constructor annotation/Retention(annotation/AnnotationRetention = ...)
 //│        enum class annotation/AnnotationRetention: Enum<annotation/AnnotationRetention>
 //│        │                   enum entry annotation/AnnotationRetention.SOURCE
@@ -40,14 +42,12 @@ fun foo(arg: Int): Int {
     return 42
 }
 
-data class Two(x: Int, y: Int)
+data class Two(val x: Int, val y: Int)
 
 fun bar(two: Two) {
 //        constructor Ann()
-//        │   [ERROR : component1() return type]
-//        │   │   constructor Ann()
-//        │   │   │   [ERROR : component2() return type]
-//        │   │   │   │    bar.two: Two
+//        │       constructor Ann()
+//        │   Int │   Int  bar.two: Two
 //        │   │   │   │    │
     val (@Ann x, @Ann y) = two
 }
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/calls.kt b/compiler/visualizer/testData/rawBuilder/expressions/calls.kt
index 0de38c12e65..7386ee668cc 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/calls.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/calls.kt
@@ -1,25 +1,23 @@
 // FIR_IGNORE
 // WITH_RUNTIME
-//                                 Int
-//                                 │ distance.x: Int
-//                                 │ │ fun (Int).plus(Int): Int
-//                                 │ │ │ distance.y: Int
-//                                 │ │ │ │
-infix fun distance(x: Int, y: Int) = x + y
+//                                    fun (Int).plus(Int): Int
+//                             Int    │ distance.y: Int
+//                             │      │ │
+infix fun Int.distance(y: Int) = this + y
 
-//              [ERROR: unknown type]
+//              Int
 //              │ Int
-//              │ │ [ERROR: not resolved]
+//              │ │ fun Int.distance(Int): Int
 //              │ │ │        Int
 //              │ │ │        │
 fun test(): Int = 3 distance 4
 
 //                     Int
-//                     │ fun distance(Int, Int): Int
-//                     │ │        Int
-//                     │ │        │  Int
-//                     │ │        │  │
-fun testRegular(): Int = distance(3, 4)
+//                     │ Int
+//                     │ │ fun Int.distance(Int): Int
+//                     │ │ │        Int
+//                     │ │ │        │
+fun testRegular(): Int = 3.distance(4)
 
 class My(var x: Int) {
 //                        Int
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/locals.kt b/compiler/visualizer/testData/rawBuilder/expressions/locals.kt
index 8769ee5b2f1..d00b0a2e4a1 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/locals.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/locals.kt
@@ -19,10 +19,9 @@ fun withLocals(p: Int): Int {
 //             │ fun (Int).plus(Int): Int
 //             │ │ fun ((Int, Int) -> Int).invoke(Int, Int): Int
 //             │ │ │ withLocals.sum.y: Int
-//             │ │ │ │ fun (Int).plus(Int): Int
-//             │ │ │ │ │ withLocals.sum.z: Int
-//             │ │ │ │ │ │
-        return x + f(y + z)
+//             │ │ │ │  withLocals.sum.z: Int
+//             │ │ │ │  │
+        return x + f(y, z)
     }
 
 //      Int              constructor Any()