diff --git a/compiler/testData/asJava/lightClasses/facades/AllPrivate.kt b/compiler/testData/asJava/lightClasses/facades/AllPrivate.kt
index 1ba5d242fbc..b1f65de093d 100644
--- a/compiler/testData/asJava/lightClasses/facades/AllPrivate.kt
+++ b/compiler/testData/asJava/lightClasses/facades/AllPrivate.kt
@@ -8,3 +8,5 @@ package p
 private fun f(): Int = 3
 
 private fun g(p: String): String = "p"
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt
index e93df9254ae..c26dab95452 100644
--- a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt
+++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt
@@ -1103,6 +1103,16 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
   visibility: PUBLIC
 
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: kotlin/Int
+  isPrimary: true
+  origin: LIBRARY
+  symbolKind: MEMBER
+  type: kotlin/Int
+  valueParameters: []
+  visibility: PRIVATE
+
 KtFirFunctionSymbol:
   annotations: []
   callableIdIfNonLocal: kotlin.Int.equals
diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt
index 1b99e0525de..22c0521ea7e 100644
--- a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt
+++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt
@@ -386,8 +386,10 @@ KtFirPropertySymbol:
   callableIdIfNonLocal: kotlin.collections.List.size
   getter: null
   hasBackingField: false
+  initializer: null
   isConst: false
   isExtension: false
+  isLateInit: false
   isOverride: false
   isVal: true
   modality: ABSTRACT
diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt
index 713d75f5d50..b40688f7b5d 100644
--- a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt
+++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt
@@ -74,8 +74,10 @@ KtFirPropertySymbol:
   callableIdIfNonLocal: kotlin.CharSequence.length
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true
+  initializer: null
   isConst: false
   isExtension: false
+  isLateInit: false
   isOverride: false
   isVal: true
   modality: ABSTRACT
@@ -1113,6 +1115,176 @@ KtFirFunctionSymbol:
   valueParameters: []
   visibility: PUBLIC
 
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: []
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(original)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(value)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(value), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(count)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(codePoints), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(count)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: [java/lang/Deprecated()]
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(ascii), KtFirConstructorValueParameterSymbol(hibyte), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(count)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: [java/lang/Deprecated()]
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(ascii), KtFirConstructorValueParameterSymbol(hibyte)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(bytes), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(length), KtFirConstructorValueParameterSymbol(charsetName)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(bytes), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(length), KtFirConstructorValueParameterSymbol(charset)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(bytes), KtFirConstructorValueParameterSymbol(charsetName)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(bytes), KtFirConstructorValueParameterSymbol(charset)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(bytes), KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(length)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(bytes)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(buffer)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(builder)]
+  visibility: PUBLIC
+
+KtFirConstructorSymbol:
+  annotations: []
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(value), KtFirConstructorValueParameterSymbol(share)]
+  visibility: UNKNOWN
+
+KtFirConstructorSymbol:
+  annotations: [java/lang/Deprecated()]
+  containingClassIdIfNonLocal: java/lang/String
+  isPrimary: false
+  origin: JAVA
+  symbolKind: MEMBER
+  type: java/lang/String
+  valueParameters: [KtFirConstructorValueParameterSymbol(offset), KtFirConstructorValueParameterSymbol(count), KtFirConstructorValueParameterSymbol(value)]
+  visibility: UNKNOWN
+
 KtFirFunctionSymbol:
   annotations: []
   callableIdIfNonLocal: kotlin.CharSequence.get
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt b/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt
index bc9f218df98..6c22be81a06 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt
@@ -9,8 +9,10 @@ KtFirPropertySymbol:
   callableIdIfNonLocal: A.x
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true
+  initializer: 10
   isConst: false
   isExtension: false
+  isLateInit: false
   isOverride: false
   isVal: true
   modality: FINAL
@@ -23,6 +25,7 @@ KtFirPropertySymbol:
   visibility: PUBLIC
 
 KtFirPropertyGetterSymbol:
+  hasBody: true
   isDefault: false
   isInline: false
   isOverride: false
@@ -37,8 +40,10 @@ KtFirPropertySymbol:
   callableIdIfNonLocal: A.y
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: false
+  initializer: null
   isConst: false
   isExtension: true
+  isLateInit: false
   isOverride: false
   isVal: true
   modality: FINAL
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt b/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt
index 20890553a12..7e1b5e97679 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt
@@ -7,8 +7,10 @@ KtFirPropertySymbol:
   callableIdIfNonLocal: x
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true
+  initializer: 10
   isConst: false
   isExtension: false
+  isLateInit: false
   isOverride: false
   isVal: true
   modality: FINAL
@@ -21,6 +23,7 @@ KtFirPropertySymbol:
   visibility: PUBLIC
 
 KtFirPropertyGetterSymbol:
+  hasBody: true
   isDefault: false
   isInline: false
   isOverride: false
@@ -35,8 +38,10 @@ KtFirPropertySymbol:
   callableIdIfNonLocal: y
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: false
+  initializer: null
   isConst: false
   isExtension: true
+  isLateInit: false
   isOverride: false
   isVal: true
   modality: FINAL
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt
index 314f85d4084..34c2026ef92 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt
@@ -10,8 +10,10 @@ KtFirPropertySymbol:
   callableIdIfNonLocal: A.a
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true
+  initializer: 10
   isConst: false
   isExtension: false
+  isLateInit: false
   isOverride: false
   isVal: true
   modality: FINAL
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt
index eb3c1af18fd..faa01f04031 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt
@@ -6,10 +6,12 @@ class A<T, R> {
 KtFirTypeParameterSymbol:
   name: T
   origin: SOURCE
+  upperBounds: [kotlin/Any?]
 
 KtFirTypeParameterSymbol:
   name: R
   origin: SOURCE
+  upperBounds: [kotlin/Any?]
 
 KtFirClassOrObjectSymbol:
   annotations: []
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt
index 356bdc81ee0..adbda64cf30 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt
@@ -5,6 +5,7 @@ fun <X> foo(x: X) {}
 KtFirTypeParameterSymbol:
   name: X
   origin: SOURCE
+  upperBounds: [kotlin/Any?]
 
 KtFirFunctionValueParameterSymbol:
   annotations: []
diff --git a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.0.java b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.0.java
index 6a7f22cfaa4..168972fa99a 100644
--- a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.0.java
+++ b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.0.java
@@ -9,4 +9,6 @@ public class JJ extends B {
     void test() {
         new <caret>B("");
     }
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.0.java b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.0.java
index 708299eafb1..c6c97ba869f 100644
--- a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.0.java
+++ b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.0.java
@@ -9,4 +9,6 @@ public class JJ extends B {
     void test() {
         new B("");
     }
-}
\ No newline at end of file
+}
+
+// FIR_IGNORE
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.0.kt
index c68f727fe5b..ccfc0e681da 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.0.kt
@@ -9,4 +9,6 @@ fun <caret>foo(
         z: String = "0"
 ) {
 
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.0.kt
index cfe3d95c4b6..3788ecb0261 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.0.kt
@@ -7,3 +7,5 @@ public open class Outer() {
         var <caret>foo: Int = 1
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt
index 16dfefe7ed2..39f58c7aecb 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt
@@ -4,3 +4,4 @@ package server
 
 var <caret>foo: String = "foo"
 
+// FIR_COMPARISON
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
index 82e7d84cffe..efe05283eae 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
@@ -81,8 +81,11 @@ abstract class AbstractIdeLightClassTest : KotlinLightCodeInsightFixtureTestCase
 
     private fun lazinessModeByFileText(): LightClassLazinessChecker.Mode {
         return testDataFile().readText().run {
-            val argument = substringAfter("LAZINESS:", "").substringBefore(" ")
-            LightClassLazinessChecker.Mode.values().firstOrNull { it.name == argument } ?: LightClassLazinessChecker.Mode.AllChecks
+            val argument = substringAfter("LAZINESS:", "").substringBefore('\n').substringBefore(' ')
+            if (argument == "") LightClassLazinessChecker.Mode.AllChecks
+            else requireNotNull(LightClassLazinessChecker.Mode.values().firstOrNull { it.name == argument }) {
+                "Invalid LAZINESS testdata parameter $argument"
+            }
         }
     }