diff --git a/compiler/fir/resolve/testData/resolve/stdlib/addAllOnJavaCollection.kt b/compiler/fir/resolve/testData/resolveWithStdlib/addAllOnJavaCollection.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/addAllOnJavaCollection.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/addAllOnJavaCollection.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/addAllOnJavaCollection.txt b/compiler/fir/resolve/testData/resolveWithStdlib/addAllOnJavaCollection.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/addAllOnJavaCollection.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/addAllOnJavaCollection.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/anonymousInDelegate.kt b/compiler/fir/resolve/testData/resolveWithStdlib/anonymousInDelegate.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/anonymousInDelegate.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/anonymousInDelegate.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/anonymousInDelegate.txt b/compiler/fir/resolve/testData/resolveWithStdlib/anonymousInDelegate.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/anonymousInDelegate.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/anonymousInDelegate.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/arrayFilterCapturedType.kt b/compiler/fir/resolve/testData/resolveWithStdlib/arrayFilterCapturedType.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/arrayFilterCapturedType.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/arrayFilterCapturedType.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/arrayFilterCapturedType.txt b/compiler/fir/resolve/testData/resolveWithStdlib/arrayFilterCapturedType.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/arrayFilterCapturedType.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/arrayFilterCapturedType.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.kt b/compiler/fir/resolve/testData/resolveWithStdlib/arrayFirstOrNull.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/arrayFirstOrNull.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt b/compiler/fir/resolve/testData/resolveWithStdlib/arrayFirstOrNull.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/arrayFirstOrNull.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/arrayInLocal.kt b/compiler/fir/resolve/testData/resolveWithStdlib/arrayInLocal.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/arrayInLocal.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/arrayInLocal.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/arrayInLocal.txt b/compiler/fir/resolve/testData/resolveWithStdlib/arrayInLocal.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/arrayInLocal.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/arrayInLocal.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/backingField.kt b/compiler/fir/resolve/testData/resolveWithStdlib/backingField.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/backingField.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/backingField.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/backingField.txt b/compiler/fir/resolve/testData/resolveWithStdlib/backingField.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/backingField.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/backingField.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/beyoundCalls.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/beyoundCalls.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/beyoundCalls.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/beyoundCalls.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/beyoundCalls.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/beyoundCalls.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/beyoundCalls.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/beyoundCalls.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/companions.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/companions.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/companions.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/companions.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/companions.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/companions.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/companions.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/companions.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/constructors.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/constructors.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/constructors.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/constructors.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/constructors.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/constructors.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/constructors.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/constructors.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/differentLevels.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/differentLevels.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/differentLevels.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/differentLevels.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/differentLevels.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/differentLevels.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/differentLevels.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/differentLevels.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/extensionReceiverInference.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/extensionReceiverInference.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/extensionReceiverInference.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/extensionReceiverInference.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/extensionReceiverInference.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/extensionReceiverInference.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/extensionReceiverInference.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/extensionReceiverInference.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/ifWithCR.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/ifWithCR.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/ifWithCR.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/ifWithCR.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/ifWithCR.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/ifWithCR.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/ifWithCR.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/ifWithCR.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/implicitTypes.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/implicitTypes.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/implicitTypes.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/implicitTypes.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/implicitTypes.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/implicitTypes.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/implicitTypes.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/implicitTypes.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/inferenceFromCallableReferenceType.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/inferenceFromCallableReferenceType.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/inferenceFromCallableReferenceType.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/inferenceFromCallableReferenceType.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/inferenceFromCallableReferenceType.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/inferenceFromCallableReferenceType.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/inferenceFromCallableReferenceType.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/inferenceFromCallableReferenceType.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/inferenceFromExpectedType.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/inferenceFromExpectedType.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/inferenceFromExpectedType.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/inferenceFromExpectedType.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/inferenceFromExpectedType.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/inferenceFromExpectedType.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/inferenceFromExpectedType.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/inferenceFromExpectedType.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/javaStatic.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/javaStatic.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/javaStatic.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/javaStatic.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/javaStatic.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/javaStatic.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/javaStatic.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/javaStatic.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyCandidatesInference.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyCandidatesInference.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyCandidatesInference.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyCandidatesInference.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyCandidatesInference.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyCandidatesInference.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyCandidatesInference.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyCandidatesInference.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnerCandidates.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnerCandidates.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnerCandidates.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnerCandidates.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnerCandidates.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnerCandidates.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnerCandidates.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnerCandidates.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnerManyOuterCandidates.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnerManyOuterCandidates.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnerManyOuterCandidates.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnerManyOuterCandidates.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnerManyOuterCandidates.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnerManyOuterCandidates.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnerManyOuterCandidates.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnerManyOuterCandidates.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyOuterCandidates.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyOuterCandidates.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyOuterCandidates.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyOuterCandidates.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyOuterCandidates.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyOuterCandidates.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyOuterCandidates.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyOuterCandidates.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/properties.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/properties.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/properties.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/properties.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/properties.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/properties.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/properties.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/properties.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/sam.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/sam.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/sam.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/sam.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/sam.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/sam.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/sam.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/sam.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleClassReceiver.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleClassReceiver.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleClassReceiver.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleClassReceiver.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleClassReceiver.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleClassReceiver.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleClassReceiver.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleClassReceiver.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleExpressionReceiver.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleExpressionReceiver.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleExpressionReceiver.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleExpressionReceiver.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleExpressionReceiver.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleExpressionReceiver.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleExpressionReceiver.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleExpressionReceiver.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleNoReceiver.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleNoReceiver.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleNoReceiver.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleNoReceiver.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleNoReceiver.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleNoReceiver.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleNoReceiver.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleNoReceiver.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/varProperties.kt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/varProperties.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/varProperties.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/varProperties.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/varProperties.txt b/compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/varProperties.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/callableReferences/varProperties.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/varProperties.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/classLiteralForParameter.kt b/compiler/fir/resolve/testData/resolveWithStdlib/classLiteralForParameter.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/classLiteralForParameter.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/classLiteralForParameter.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/classLiteralForParameter.txt b/compiler/fir/resolve/testData/resolveWithStdlib/classLiteralForParameter.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/classLiteralForParameter.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/classLiteralForParameter.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/companionLoad.kt b/compiler/fir/resolve/testData/resolveWithStdlib/companionLoad.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/companionLoad.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/companionLoad.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/companionLoad.txt b/compiler/fir/resolve/testData/resolveWithStdlib/companionLoad.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/companionLoad.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/companionLoad.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/components.kt b/compiler/fir/resolve/testData/resolveWithStdlib/components.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/components.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/components.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/components.txt b/compiler/fir/resolve/testData/resolveWithStdlib/components.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/components.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/components.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/concurrent.kt b/compiler/fir/resolve/testData/resolveWithStdlib/concurrent.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/concurrent.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/concurrent.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/concurrent.txt b/compiler/fir/resolve/testData/resolveWithStdlib/concurrent.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/concurrent.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/concurrent.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/concurrentMapOfAliases.kt b/compiler/fir/resolve/testData/resolveWithStdlib/concurrentMapOfAliases.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/concurrentMapOfAliases.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/concurrentMapOfAliases.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/concurrentMapOfAliases.txt b/compiler/fir/resolve/testData/resolveWithStdlib/concurrentMapOfAliases.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/concurrentMapOfAliases.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/concurrentMapOfAliases.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/contracts/callsInPlace.dot b/compiler/fir/resolve/testData/resolveWithStdlib/contracts/callsInPlace.dot
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/contracts/callsInPlace.dot
rename to compiler/fir/resolve/testData/resolveWithStdlib/contracts/callsInPlace.dot
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/contracts/callsInPlace.kt b/compiler/fir/resolve/testData/resolveWithStdlib/contracts/callsInPlace.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/contracts/callsInPlace.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/contracts/callsInPlace.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/contracts/callsInPlace.txt b/compiler/fir/resolve/testData/resolveWithStdlib/contracts/callsInPlace.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/contracts/callsInPlace.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/contracts/callsInPlace.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/contracts/conditionalEffects.dot b/compiler/fir/resolve/testData/resolveWithStdlib/contracts/conditionalEffects.dot
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/contracts/conditionalEffects.dot
rename to compiler/fir/resolve/testData/resolveWithStdlib/contracts/conditionalEffects.dot
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/contracts/conditionalEffects.kt b/compiler/fir/resolve/testData/resolveWithStdlib/contracts/conditionalEffects.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/contracts/conditionalEffects.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/contracts/conditionalEffects.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/contracts/conditionalEffects.txt b/compiler/fir/resolve/testData/resolveWithStdlib/contracts/conditionalEffects.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/contracts/conditionalEffects.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/contracts/conditionalEffects.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/emptyArray.kt b/compiler/fir/resolve/testData/resolveWithStdlib/emptyArray.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/emptyArray.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/emptyArray.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/emptyArray.txt b/compiler/fir/resolve/testData/resolveWithStdlib/emptyArray.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/emptyArray.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/emptyArray.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/exception.kt b/compiler/fir/resolve/testData/resolveWithStdlib/exception.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/exception.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/exception.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/exception.txt b/compiler/fir/resolve/testData/resolveWithStdlib/exception.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/exception.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/exception.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.kt b/compiler/fir/resolve/testData/resolveWithStdlib/factoryFunctionOverloads.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/factoryFunctionOverloads.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt b/compiler/fir/resolve/testData/resolveWithStdlib/factoryFunctionOverloads.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/factoryFunctionOverloads.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/functionAndFunctionN.kt b/compiler/fir/resolve/testData/resolveWithStdlib/functionAndFunctionN.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/functionAndFunctionN.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/functionAndFunctionN.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/functionAndFunctionN.txt b/compiler/fir/resolve/testData/resolveWithStdlib/functionAndFunctionN.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/functionAndFunctionN.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/functionAndFunctionN.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/functionX.kt b/compiler/fir/resolve/testData/resolveWithStdlib/functionX.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/functionX.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/functionX.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/functionX.txt b/compiler/fir/resolve/testData/resolveWithStdlib/functionX.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/functionX.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/functionX.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/getOnKProperty.kt b/compiler/fir/resolve/testData/resolveWithStdlib/getOnKProperty.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/getOnKProperty.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/getOnKProperty.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/getOnKProperty.txt b/compiler/fir/resolve/testData/resolveWithStdlib/getOnKProperty.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/getOnKProperty.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/getOnKProperty.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/hashMapTypeAlias.kt b/compiler/fir/resolve/testData/resolveWithStdlib/hashMapTypeAlias.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/hashMapTypeAlias.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/hashMapTypeAlias.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/hashMapTypeAlias.txt b/compiler/fir/resolve/testData/resolveWithStdlib/hashMapTypeAlias.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/hashMapTypeAlias.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/hashMapTypeAlias.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/hashSet.kt b/compiler/fir/resolve/testData/resolveWithStdlib/hashSet.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/hashSet.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/hashSet.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/hashSet.txt b/compiler/fir/resolve/testData/resolveWithStdlib/hashSet.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/hashSet.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/hashSet.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/hashTableWithForEach.kt b/compiler/fir/resolve/testData/resolveWithStdlib/hashTableWithForEach.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/hashTableWithForEach.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/hashTableWithForEach.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/hashTableWithForEach.txt b/compiler/fir/resolve/testData/resolveWithStdlib/hashTableWithForEach.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/hashTableWithForEach.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/hashTableWithForEach.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/helloWorld.kt b/compiler/fir/resolve/testData/resolveWithStdlib/helloWorld.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/helloWorld.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/helloWorld.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/helloWorld.txt b/compiler/fir/resolve/testData/resolveWithStdlib/helloWorld.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/helloWorld.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/helloWorld.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/implicitReceiverOrder.kt b/compiler/fir/resolve/testData/resolveWithStdlib/implicitReceiverOrder.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/implicitReceiverOrder.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/implicitReceiverOrder.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/implicitReceiverOrder.txt b/compiler/fir/resolve/testData/resolveWithStdlib/implicitReceiverOrder.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/implicitReceiverOrder.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/implicitReceiverOrder.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/inference/complexConstraintSystem.kt b/compiler/fir/resolve/testData/resolveWithStdlib/inference/complexConstraintSystem.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/inference/complexConstraintSystem.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/inference/complexConstraintSystem.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/inference/complexConstraintSystem.txt b/compiler/fir/resolve/testData/resolveWithStdlib/inference/complexConstraintSystem.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/inference/complexConstraintSystem.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/inference/complexConstraintSystem.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/FieldAndGetter.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/FieldAndGetter.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/FieldAndGetter.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/FieldAndGetter.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/FieldAndGetter.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/FieldAndGetter.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/FieldAndGetter.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/FieldAndGetter.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/FieldSubstitution.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/FieldSubstitution.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/FieldSubstitution.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/FieldSubstitution.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/FieldSubstitution.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/FieldSubstitution.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/FieldSubstitution.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/FieldSubstitution.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/FunctionTypeInJava.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/FunctionTypeInJava.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/FunctionTypeInJava.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/FunctionTypeInJava.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/FunctionTypeInJava.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/FunctionTypeInJava.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/FunctionTypeInJava.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/FunctionTypeInJava.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/JavaVisibility2.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/JavaVisibility2.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/JavaVisibility2.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/JavaVisibility2.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/JavaVisibility2.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/JavaVisibility2.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/JavaVisibility2.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/JavaVisibility2.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchy.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKComplexHierarchy.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchy.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKComplexHierarchy.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchy.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKComplexHierarchy.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchy.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKComplexHierarchy.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchyWithNested.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchyWithNested.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchyWithNested.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchyWithNested.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKInheritance.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKInheritance.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKInheritance.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKInheritance.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKInheritance.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKInheritance.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKInheritance.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKInheritance.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKInheritanceGeneric.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKInheritanceGeneric.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKInheritanceGeneric.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKInheritanceGeneric.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KotlinClassParameter.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KotlinClassParameter.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KotlinClassParameter.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KotlinClassParameter.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KotlinClassParameter.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KotlinClassParameter.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KotlinClassParameter.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KotlinClassParameter.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KotlinClassParameterGeneric.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KotlinClassParameterGeneric.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KotlinClassParameterGeneric.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/KotlinClassParameterGeneric.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/LoggerInstance.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/LoggerInstance.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/LoggerInstance.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/LoggerInstance.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/LoggerInstance.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/LoggerInstance.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/LoggerInstance.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/LoggerInstance.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/MapCompute.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/MapCompute.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/MapCompute.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/MapCompute.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/MapCompute.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/MapCompute.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/MapCompute.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/MapCompute.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/MapEntry.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/MapEntry.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/MapEntry.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/MapEntry.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/MapEntry.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/MapEntry.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/MapEntry.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/MapEntry.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/MyException.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyException.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/MyException.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyException.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/MyException.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyException.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/MyException.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyException.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/MyIterable.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyIterable.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/MyIterable.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyIterable.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/MyIterable.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyIterable.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/MyIterable.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyIterable.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/MyMap.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyMap.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/MyMap.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyMap.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/MyMap.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyMap.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/MyMap.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyMap.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/RawType.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/RawType.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/RawType.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/RawType.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/RawType.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/RawType.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/RawType.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/RawType.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticClassConstructorFromBaseClass.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticClassConstructorFromBaseClass.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticClassConstructorFromBaseClass.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticClassConstructorFromBaseClass.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticClassConstructorFromBaseClass.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticClassConstructorFromBaseClass.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticClassConstructorFromBaseClass.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticClassConstructorFromBaseClass.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticFromBaseClass.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticFromBaseClass.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticFromBaseClass.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticFromBaseClass.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticFromBaseClass.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticFromBaseClass.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticFromBaseClass.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticFromBaseClass.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticGenericMethod.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticGenericMethod.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticGenericMethod.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticGenericMethod.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticGenericMethod.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticGenericMethod.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticGenericMethod.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticGenericMethod.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/SyntheticAfterFiltering.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/SyntheticAfterFiltering.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/SyntheticAfterFiltering.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/SyntheticAfterFiltering.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/SyntheticAfterFiltering.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/SyntheticAfterFiltering.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/SyntheticAfterFiltering.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/SyntheticAfterFiltering.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/SyntheticWithForEach.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/SyntheticWithForEach.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/SyntheticWithForEach.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/SyntheticWithForEach.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/SyntheticWithForEach.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/SyntheticWithForEach.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/capturedFlexible.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/capturedFlexible.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/capturedFlexible.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/capturedFlexible.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/capturedFlexible.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/capturedFlexible.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/capturedFlexible.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/capturedFlexible.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/complexFlexibleInference.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/complexFlexibleInference.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/complexFlexibleInference.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/complexFlexibleInference.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/complexFlexibleInference.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/complexFlexibleInference.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/complexFlexibleInference.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/complexFlexibleInference.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/outerInnerClasses.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/outerInnerClasses.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/outerInnerClasses.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/outerInnerClasses.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/outerInnerClasses.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/outerInnerClasses.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/outerInnerClasses.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/outerInnerClasses.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/smartSet.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/smartSet.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/smartSet.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/smartSet.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/smartSet.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/smartSet.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/smartSet.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/smartSet.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/typeParameterUse.kt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/typeParameterUse.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/typeParameterUse.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/typeParameterUse.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/typeParameterUse.txt b/compiler/fir/resolve/testData/resolveWithStdlib/j+k/typeParameterUse.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/j+k/typeParameterUse.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/j+k/typeParameterUse.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/javaEnumSynthetic.kt b/compiler/fir/resolve/testData/resolveWithStdlib/javaEnumSynthetic.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/javaEnumSynthetic.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/javaEnumSynthetic.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/javaEnumSynthetic.txt b/compiler/fir/resolve/testData/resolveWithStdlib/javaEnumSynthetic.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/javaEnumSynthetic.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/javaEnumSynthetic.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/javaLangComparator.kt b/compiler/fir/resolve/testData/resolveWithStdlib/javaLangComparator.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/javaLangComparator.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/javaLangComparator.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/javaLangComparator.txt b/compiler/fir/resolve/testData/resolveWithStdlib/javaLangComparator.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/javaLangComparator.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/javaLangComparator.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/kotlinComparatorAlias.kt b/compiler/fir/resolve/testData/resolveWithStdlib/kotlinComparatorAlias.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/kotlinComparatorAlias.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/kotlinComparatorAlias.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/kotlinComparatorAlias.txt b/compiler/fir/resolve/testData/resolveWithStdlib/kotlinComparatorAlias.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/kotlinComparatorAlias.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/kotlinComparatorAlias.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/listPlusAssign.kt b/compiler/fir/resolve/testData/resolveWithStdlib/listPlusAssign.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/listPlusAssign.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/listPlusAssign.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/listPlusAssign.txt b/compiler/fir/resolve/testData/resolveWithStdlib/listPlusAssign.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/listPlusAssign.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/listPlusAssign.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/mapList.kt b/compiler/fir/resolve/testData/resolveWithStdlib/mapList.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/mapList.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/mapList.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/mapList.txt b/compiler/fir/resolve/testData/resolveWithStdlib/mapList.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/mapList.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/mapList.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/multipleImplicitReceivers.kt b/compiler/fir/resolve/testData/resolveWithStdlib/multipleImplicitReceivers.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/multipleImplicitReceivers.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/multipleImplicitReceivers.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/multipleImplicitReceivers.txt b/compiler/fir/resolve/testData/resolveWithStdlib/multipleImplicitReceivers.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/multipleImplicitReceivers.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/multipleImplicitReceivers.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/noneWithForEach.kt b/compiler/fir/resolve/testData/resolveWithStdlib/noneWithForEach.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/noneWithForEach.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/noneWithForEach.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/noneWithForEach.txt b/compiler/fir/resolve/testData/resolveWithStdlib/noneWithForEach.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/noneWithForEach.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/noneWithForEach.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/nullableTypeParameter.kt b/compiler/fir/resolve/testData/resolveWithStdlib/nullableTypeParameter.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/nullableTypeParameter.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/nullableTypeParameter.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/nullableTypeParameter.txt b/compiler/fir/resolve/testData/resolveWithStdlib/nullableTypeParameter.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/nullableTypeParameter.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/nullableTypeParameter.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems.kt b/compiler/fir/resolve/testData/resolveWithStdlib/problems.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems.txt b/compiler/fir/resolve/testData/resolveWithStdlib/problems.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/KJKComplexHierarchyNestedLoop.kt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/KJKComplexHierarchyNestedLoop.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/KJKComplexHierarchyNestedLoop.txt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/KJKComplexHierarchyNestedLoop.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/cloneArray.kt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/cloneArray.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/cloneArray.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/cloneArray.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/cloneArray.txt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/cloneArray.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/cloneArray.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/cloneArray.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/complexSmartCasts.kt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/complexSmartCasts.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/complexSmartCasts.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/complexSmartCasts.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/complexSmartCasts.txt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/complexSmartCasts.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/complexSmartCasts.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/complexSmartCasts.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/delegateTypeMismatch.kt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/delegateTypeMismatch.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/delegateTypeMismatch.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/delegateTypeMismatch.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/delegateTypeMismatch.txt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/delegateTypeMismatch.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/delegateTypeMismatch.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/delegateTypeMismatch.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/inapplicableRemoveAll.kt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/inapplicableRemoveAll.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/inapplicableRemoveAll.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/inapplicableRemoveAll.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/inapplicableRemoveAll.txt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/inapplicableRemoveAll.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/inapplicableRemoveAll.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/inapplicableRemoveAll.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/invokePriority.kt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/invokePriority.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/invokePriority.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/invokePriority.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/invokePriority.txt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/invokePriority.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/invokePriority.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/invokePriority.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/weakHashMap.kt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/weakHashMap.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/weakHashMap.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/weakHashMap.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/weakHashMap.txt b/compiler/fir/resolve/testData/resolveWithStdlib/problems/weakHashMap.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/problems/weakHashMap.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/problems/weakHashMap.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/rangeTo.kt b/compiler/fir/resolve/testData/resolveWithStdlib/rangeTo.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/rangeTo.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/rangeTo.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/rangeTo.txt b/compiler/fir/resolve/testData/resolveWithStdlib/rangeTo.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/rangeTo.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/rangeTo.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/recursiveBug.kt b/compiler/fir/resolve/testData/resolveWithStdlib/recursiveBug.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/recursiveBug.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/recursiveBug.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/recursiveBug.txt b/compiler/fir/resolve/testData/resolveWithStdlib/recursiveBug.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/recursiveBug.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/recursiveBug.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.kt b/compiler/fir/resolve/testData/resolveWithStdlib/reflectionClass.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/reflectionClass.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt b/compiler/fir/resolve/testData/resolveWithStdlib/reflectionClass.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/reflectionClass.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/removeOnAbstractMap.kt b/compiler/fir/resolve/testData/resolveWithStdlib/removeOnAbstractMap.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/removeOnAbstractMap.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/removeOnAbstractMap.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/removeOnAbstractMap.txt b/compiler/fir/resolve/testData/resolveWithStdlib/removeOnAbstractMap.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/removeOnAbstractMap.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/removeOnAbstractMap.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/runOnIntegerLiteral.kt b/compiler/fir/resolve/testData/resolveWithStdlib/runOnIntegerLiteral.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/runOnIntegerLiteral.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/runOnIntegerLiteral.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/runOnIntegerLiteral.txt b/compiler/fir/resolve/testData/resolveWithStdlib/runOnIntegerLiteral.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/runOnIntegerLiteral.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/runOnIntegerLiteral.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.kt b/compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegateProvider.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegateProvider.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.txt b/compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegateProvider.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegateProvider.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegatedToMap.kt b/compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegatedToMap.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/simpleDelegatedToMap.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegatedToMap.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegatedToMap.txt b/compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegatedToMap.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/simpleDelegatedToMap.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegatedToMap.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/simpleLazy.kt b/compiler/fir/resolve/testData/resolveWithStdlib/simpleLazy.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/simpleLazy.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/simpleLazy.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/simpleLazy.txt b/compiler/fir/resolve/testData/resolveWithStdlib/simpleLazy.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/simpleLazy.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/simpleLazy.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/smartcasts/tryWithLambdaInside.dot b/compiler/fir/resolve/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/smartcasts/tryWithLambdaInside.dot
rename to compiler/fir/resolve/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/smartcasts/tryWithLambdaInside.kt b/compiler/fir/resolve/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/smartcasts/tryWithLambdaInside.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/smartcasts/tryWithLambdaInside.txt b/compiler/fir/resolve/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/smartcasts/tryWithLambdaInside.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/toSortedMapWithComparator.kt b/compiler/fir/resolve/testData/resolveWithStdlib/toSortedMapWithComparator.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/toSortedMapWithComparator.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/toSortedMapWithComparator.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/toSortedMapWithComparator.txt b/compiler/fir/resolve/testData/resolveWithStdlib/toSortedMapWithComparator.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/toSortedMapWithComparator.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/toSortedMapWithComparator.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/topLevelResolve.kt b/compiler/fir/resolve/testData/resolveWithStdlib/topLevelResolve.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/topLevelResolve.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/topLevelResolve.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/topLevelResolve.txt b/compiler/fir/resolve/testData/resolveWithStdlib/topLevelResolve.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/topLevelResolve.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/topLevelResolve.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/typeAliasDeserialization.kt b/compiler/fir/resolve/testData/resolveWithStdlib/typeAliasDeserialization.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/typeAliasDeserialization.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/typeAliasDeserialization.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/typeAliasDeserialization.txt b/compiler/fir/resolve/testData/resolveWithStdlib/typeAliasDeserialization.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/typeAliasDeserialization.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/typeAliasDeserialization.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/typeAliasWithForEach.kt b/compiler/fir/resolve/testData/resolveWithStdlib/typeAliasWithForEach.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/typeAliasWithForEach.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/typeAliasWithForEach.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/typeAliasWithForEach.txt b/compiler/fir/resolve/testData/resolveWithStdlib/typeAliasWithForEach.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/typeAliasWithForEach.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/typeAliasWithForEach.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/typeParameterDerived.kt b/compiler/fir/resolve/testData/resolveWithStdlib/typeParameterDerived.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/typeParameterDerived.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/typeParameterDerived.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/typeParameterDerived.txt b/compiler/fir/resolve/testData/resolveWithStdlib/typeParameterDerived.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/typeParameterDerived.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/typeParameterDerived.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.kt b/compiler/fir/resolve/testData/resolveWithStdlib/unaryOperators.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/unaryOperators.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.txt b/compiler/fir/resolve/testData/resolveWithStdlib/unaryOperators.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/unaryOperators.txt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/whenAsLambdaReturnStatement.kt b/compiler/fir/resolve/testData/resolveWithStdlib/whenAsLambdaReturnStatement.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/whenAsLambdaReturnStatement.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/whenAsLambdaReturnStatement.kt
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/whenAsLambdaReturnStatement.txt b/compiler/fir/resolve/testData/resolveWithStdlib/whenAsLambdaReturnStatement.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/stdlib/whenAsLambdaReturnStatement.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/whenAsLambdaReturnStatement.txt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithCfgAndStdlibTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithCfgAndStdlibTestGenerated.java
index 7c5e09a83ff..fab7f99e0c5 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithCfgAndStdlibTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithCfgAndStdlibTestGenerated.java
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @RunWith(JUnit3RunnerWithInners.class)
 public class FirDiagnosticsWithCfgAndStdlibTestGenerated extends AbstractFirDiagnosticsWithCfgAndStdlibTest {
-    @TestMetadata("compiler/fir/resolve/testData/resolve/stdlib/contracts")
+    @TestMetadata("compiler/fir/resolve/testData/resolveWithStdlib/contracts")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Contracts extends AbstractFirDiagnosticsWithCfgAndStdlibTest {
@@ -27,21 +27,21 @@ public class FirDiagnosticsWithCfgAndStdlibTestGenerated extends AbstractFirDiag
         }
 
         public void testAllFilesPresentInContracts() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/stdlib/contracts"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolveWithStdlib/contracts"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @TestMetadata("callsInPlace.kt")
         public void testCallsInPlace() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/contracts/callsInPlace.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/contracts/callsInPlace.kt");
         }
 
         @TestMetadata("conditionalEffects.kt")
         public void testConditionalEffects() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/contracts/conditionalEffects.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/contracts/conditionalEffects.kt");
         }
     }
 
-    @TestMetadata("compiler/fir/resolve/testData/resolve/stdlib/smartcasts")
+    @TestMetadata("compiler/fir/resolve/testData/resolveWithStdlib/smartcasts")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Smartcasts extends AbstractFirDiagnosticsWithCfgAndStdlibTest {
@@ -50,12 +50,12 @@ public class FirDiagnosticsWithCfgAndStdlibTestGenerated extends AbstractFirDiag
         }
 
         public void testAllFilesPresentInSmartcasts() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/stdlib/smartcasts"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolveWithStdlib/smartcasts"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @TestMetadata("tryWithLambdaInside.kt")
         public void testTryWithLambdaInside() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/smartcasts/tryWithLambdaInside.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.kt");
         }
     }
 }
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
index 59913938f8e..b1e6d842228 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/fir/resolve/testData/resolve/stdlib")
+@TestMetadata("compiler/fir/resolve/testData/resolveWithStdlib")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnosticsWithStdlibTest {
@@ -26,239 +26,239 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
 
     @TestMetadata("addAllOnJavaCollection.kt")
     public void testAddAllOnJavaCollection() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/addAllOnJavaCollection.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/addAllOnJavaCollection.kt");
     }
 
-    public void testAllFilesPresentInStdlib() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/stdlib"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "contracts", "smartcasts");
+    public void testAllFilesPresentInResolveWithStdlib() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolveWithStdlib"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "contracts", "smartcasts");
     }
 
     @TestMetadata("anonymousInDelegate.kt")
     public void testAnonymousInDelegate() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/anonymousInDelegate.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/anonymousInDelegate.kt");
     }
 
     @TestMetadata("arrayFilterCapturedType.kt")
     public void testArrayFilterCapturedType() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/arrayFilterCapturedType.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/arrayFilterCapturedType.kt");
     }
 
     @TestMetadata("arrayFirstOrNull.kt")
     public void testArrayFirstOrNull() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/arrayFirstOrNull.kt");
     }
 
     @TestMetadata("arrayInLocal.kt")
     public void testArrayInLocal() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/arrayInLocal.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/arrayInLocal.kt");
     }
 
     @TestMetadata("backingField.kt")
     public void testBackingField() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/backingField.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/backingField.kt");
     }
 
     @TestMetadata("classLiteralForParameter.kt")
     public void testClassLiteralForParameter() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/classLiteralForParameter.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/classLiteralForParameter.kt");
     }
 
     @TestMetadata("companionLoad.kt")
     public void testCompanionLoad() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/companionLoad.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/companionLoad.kt");
     }
 
     @TestMetadata("components.kt")
     public void testComponents() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/components.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/components.kt");
     }
 
     @TestMetadata("concurrent.kt")
     public void testConcurrent() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/concurrent.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/concurrent.kt");
     }
 
     @TestMetadata("concurrentMapOfAliases.kt")
     public void testConcurrentMapOfAliases() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/concurrentMapOfAliases.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/concurrentMapOfAliases.kt");
     }
 
     @TestMetadata("emptyArray.kt")
     public void testEmptyArray() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/emptyArray.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/emptyArray.kt");
     }
 
     @TestMetadata("exception.kt")
     public void testException() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/exception.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/exception.kt");
     }
 
     @TestMetadata("factoryFunctionOverloads.kt")
     public void testFactoryFunctionOverloads() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/factoryFunctionOverloads.kt");
     }
 
     @TestMetadata("functionAndFunctionN.kt")
     public void testFunctionAndFunctionN() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/functionAndFunctionN.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/functionAndFunctionN.kt");
     }
 
     @TestMetadata("functionX.kt")
     public void testFunctionX() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/functionX.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/functionX.kt");
     }
 
     @TestMetadata("getOnKProperty.kt")
     public void testGetOnKProperty() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/getOnKProperty.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/getOnKProperty.kt");
     }
 
     @TestMetadata("hashMapTypeAlias.kt")
     public void testHashMapTypeAlias() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/hashMapTypeAlias.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/hashMapTypeAlias.kt");
     }
 
     @TestMetadata("hashSet.kt")
     public void testHashSet() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/hashSet.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/hashSet.kt");
     }
 
     @TestMetadata("hashTableWithForEach.kt")
     public void testHashTableWithForEach() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/hashTableWithForEach.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/hashTableWithForEach.kt");
     }
 
     @TestMetadata("helloWorld.kt")
     public void testHelloWorld() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/helloWorld.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/helloWorld.kt");
     }
 
     @TestMetadata("implicitReceiverOrder.kt")
     public void testImplicitReceiverOrder() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/implicitReceiverOrder.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/implicitReceiverOrder.kt");
     }
 
     @TestMetadata("javaEnumSynthetic.kt")
     public void testJavaEnumSynthetic() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/javaEnumSynthetic.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/javaEnumSynthetic.kt");
     }
 
     @TestMetadata("javaLangComparator.kt")
     public void testJavaLangComparator() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/javaLangComparator.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/javaLangComparator.kt");
     }
 
     @TestMetadata("kotlinComparatorAlias.kt")
     public void testKotlinComparatorAlias() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/kotlinComparatorAlias.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/kotlinComparatorAlias.kt");
     }
 
     @TestMetadata("listPlusAssign.kt")
     public void testListPlusAssign() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/listPlusAssign.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/listPlusAssign.kt");
     }
 
     @TestMetadata("mapList.kt")
     public void testMapList() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/mapList.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/mapList.kt");
     }
 
     @TestMetadata("multipleImplicitReceivers.kt")
     public void testMultipleImplicitReceivers() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/multipleImplicitReceivers.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/multipleImplicitReceivers.kt");
     }
 
     @TestMetadata("noneWithForEach.kt")
     public void testNoneWithForEach() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/noneWithForEach.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/noneWithForEach.kt");
     }
 
     @TestMetadata("nullableTypeParameter.kt")
     public void testNullableTypeParameter() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/nullableTypeParameter.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/nullableTypeParameter.kt");
     }
 
     @TestMetadata("problems.kt")
     public void testProblems() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/problems.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems.kt");
     }
 
     @TestMetadata("rangeTo.kt")
     public void testRangeTo() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/rangeTo.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/rangeTo.kt");
     }
 
     @TestMetadata("recursiveBug.kt")
     public void testRecursiveBug() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/recursiveBug.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/recursiveBug.kt");
     }
 
     @TestMetadata("reflectionClass.kt")
     public void testReflectionClass() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/reflectionClass.kt");
     }
 
     @TestMetadata("removeOnAbstractMap.kt")
     public void testRemoveOnAbstractMap() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/removeOnAbstractMap.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/removeOnAbstractMap.kt");
     }
 
     @TestMetadata("runOnIntegerLiteral.kt")
     public void testRunOnIntegerLiteral() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/runOnIntegerLiteral.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/runOnIntegerLiteral.kt");
     }
 
     @TestMetadata("simpleDelegateProvider.kt")
     public void testSimpleDelegateProvider() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegateProvider.kt");
     }
 
     @TestMetadata("simpleDelegatedToMap.kt")
     public void testSimpleDelegatedToMap() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/simpleDelegatedToMap.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/simpleDelegatedToMap.kt");
     }
 
     @TestMetadata("simpleLazy.kt")
     public void testSimpleLazy() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/simpleLazy.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/simpleLazy.kt");
     }
 
     @TestMetadata("toSortedMapWithComparator.kt")
     public void testToSortedMapWithComparator() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/toSortedMapWithComparator.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/toSortedMapWithComparator.kt");
     }
 
     @TestMetadata("topLevelResolve.kt")
     public void testTopLevelResolve() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/topLevelResolve.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/topLevelResolve.kt");
     }
 
     @TestMetadata("typeAliasDeserialization.kt")
     public void testTypeAliasDeserialization() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/typeAliasDeserialization.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/typeAliasDeserialization.kt");
     }
 
     @TestMetadata("typeAliasWithForEach.kt")
     public void testTypeAliasWithForEach() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/typeAliasWithForEach.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/typeAliasWithForEach.kt");
     }
 
     @TestMetadata("typeParameterDerived.kt")
     public void testTypeParameterDerived() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/typeParameterDerived.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/typeParameterDerived.kt");
     }
 
     @TestMetadata("unaryOperators.kt")
     public void testUnaryOperators() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/unaryOperators.kt");
     }
 
     @TestMetadata("whenAsLambdaReturnStatement.kt")
     public void testWhenAsLambdaReturnStatement() throws Exception {
-        runTest("compiler/fir/resolve/testData/resolve/stdlib/whenAsLambdaReturnStatement.kt");
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/whenAsLambdaReturnStatement.kt");
     }
 
-    @TestMetadata("compiler/fir/resolve/testData/resolve/stdlib/callableReferences")
+    @TestMetadata("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CallableReferences extends AbstractFirDiagnosticsWithStdlibTest {
@@ -267,115 +267,115 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         }
 
         public void testAllFilesPresentInCallableReferences() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/stdlib/callableReferences"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @TestMetadata("beyoundCalls.kt")
         public void testBeyoundCalls() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/beyoundCalls.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/beyoundCalls.kt");
         }
 
         @TestMetadata("companions.kt")
         public void testCompanions() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/companions.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/companions.kt");
         }
 
         @TestMetadata("constructors.kt")
         public void testConstructors() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/constructors.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/constructors.kt");
         }
 
         @TestMetadata("differentLevels.kt")
         public void testDifferentLevels() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/differentLevels.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/differentLevels.kt");
         }
 
         @TestMetadata("extensionReceiverInference.kt")
         public void testExtensionReceiverInference() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/extensionReceiverInference.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/extensionReceiverInference.kt");
         }
 
         @TestMetadata("ifWithCR.kt")
         public void testIfWithCR() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/ifWithCR.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/ifWithCR.kt");
         }
 
         @TestMetadata("implicitTypes.kt")
         public void testImplicitTypes() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/implicitTypes.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/implicitTypes.kt");
         }
 
         @TestMetadata("inferenceFromCallableReferenceType.kt")
         public void testInferenceFromCallableReferenceType() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/inferenceFromCallableReferenceType.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/inferenceFromCallableReferenceType.kt");
         }
 
         @TestMetadata("inferenceFromExpectedType.kt")
         public void testInferenceFromExpectedType() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/inferenceFromExpectedType.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/inferenceFromExpectedType.kt");
         }
 
         @TestMetadata("javaStatic.kt")
         public void testJavaStatic() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/javaStatic.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/javaStatic.kt");
         }
 
         @TestMetadata("manyCandidatesInference.kt")
         public void testManyCandidatesInference() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyCandidatesInference.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyCandidatesInference.kt");
         }
 
         @TestMetadata("manyInnerCandidates.kt")
         public void testManyInnerCandidates() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnerCandidates.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnerCandidates.kt");
         }
 
         @TestMetadata("manyInnerManyOuterCandidates.kt")
         public void testManyInnerManyOuterCandidates() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnerManyOuterCandidates.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnerManyOuterCandidates.kt");
         }
 
         @TestMetadata("manyInnermanyOuterCandidatesAmbiguity.kt")
         public void testManyInnermanyOuterCandidatesAmbiguity() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.kt");
         }
 
         @TestMetadata("manyOuterCandidates.kt")
         public void testManyOuterCandidates() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/manyOuterCandidates.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/manyOuterCandidates.kt");
         }
 
         @TestMetadata("properties.kt")
         public void testProperties() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/properties.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/properties.kt");
         }
 
         @TestMetadata("sam.kt")
         public void testSam() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/sam.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/sam.kt");
         }
 
         @TestMetadata("simpleClassReceiver.kt")
         public void testSimpleClassReceiver() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleClassReceiver.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleClassReceiver.kt");
         }
 
         @TestMetadata("simpleExpressionReceiver.kt")
         public void testSimpleExpressionReceiver() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleExpressionReceiver.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleExpressionReceiver.kt");
         }
 
         @TestMetadata("simpleNoReceiver.kt")
         public void testSimpleNoReceiver() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/simpleNoReceiver.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/simpleNoReceiver.kt");
         }
 
         @TestMetadata("varProperties.kt")
         public void testVarProperties() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/varProperties.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/varProperties.kt");
         }
 
-        @TestMetadata("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests")
+        @TestMetadata("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class FromBasicDiagnosticTests extends AbstractFirDiagnosticsWithStdlibTest {
@@ -384,77 +384,77 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
             }
 
             public void testAllFilesPresentInFromBasicDiagnosticTests() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+                KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
             }
 
             @TestMetadata("ambiguityWhenNoApplicableCallableReferenceCandidate.kt")
             public void testAmbiguityWhenNoApplicableCallableReferenceCandidate() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.kt");
             }
 
             @TestMetadata("applicableCallableReferenceFromDistantScope.kt")
             public void testApplicableCallableReferenceFromDistantScope() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.kt");
             }
 
             @TestMetadata("chooseCallableReferenceDependingOnInferredReceiver.kt")
             public void testChooseCallableReferenceDependingOnInferredReceiver() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.kt");
             }
 
             @TestMetadata("commonSupertypeFromReturnTypesOfCallableReference.kt")
             public void testCommonSupertypeFromReturnTypesOfCallableReference() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.kt");
             }
 
             @TestMetadata("eagerAndPostponedCallableReferences.kt")
             public void testEagerAndPostponedCallableReferences() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.kt");
             }
 
             @TestMetadata("eagerResolveOfSingleCallableReference.kt")
             public void testEagerResolveOfSingleCallableReference() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.kt");
             }
 
             @TestMetadata("moreSpecificAmbiguousExtensions.kt")
             public void testMoreSpecificAmbiguousExtensions() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.kt");
             }
 
             @TestMetadata("multipleOutersAndMultipleCallableReferences.kt")
             public void testMultipleOutersAndMultipleCallableReferences() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.kt");
             }
 
             @TestMetadata("noAmbiguityBetweenTopLevelAndMemberProperty.kt")
             public void testNoAmbiguityBetweenTopLevelAndMemberProperty() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.kt");
             }
 
             @TestMetadata("overloadsBound.kt")
             public void testOverloadsBound() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.kt");
             }
 
             @TestMetadata("postponedResolveOfManyCallableReference.kt")
             public void testPostponedResolveOfManyCallableReference() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.kt");
             }
 
             @TestMetadata("resolveCallableReferencesAfterAllSimpleArguments.kt")
             public void testResolveCallableReferencesAfterAllSimpleArguments() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.kt");
             }
 
             @TestMetadata("withGenericFun.kt")
             public void testWithGenericFun() throws Exception {
-                runTest("compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.kt");
+                runTest("compiler/fir/resolve/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.kt");
             }
         }
     }
 
-    @TestMetadata("compiler/fir/resolve/testData/resolve/stdlib/inference")
+    @TestMetadata("compiler/fir/resolve/testData/resolveWithStdlib/inference")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Inference extends AbstractFirDiagnosticsWithStdlibTest {
@@ -463,16 +463,16 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         }
 
         public void testAllFilesPresentInInference() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/stdlib/inference"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolveWithStdlib/inference"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @TestMetadata("complexConstraintSystem.kt")
         public void testComplexConstraintSystem() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/inference/complexConstraintSystem.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/inference/complexConstraintSystem.kt");
         }
     }
 
-    @TestMetadata("compiler/fir/resolve/testData/resolve/stdlib/j+k")
+    @TestMetadata("compiler/fir/resolve/testData/resolveWithStdlib/j+k")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class J_k extends AbstractFirDiagnosticsWithStdlibTest {
@@ -481,146 +481,146 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         }
 
         public void testAllFilesPresentInJ_k() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/stdlib/j+k"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolveWithStdlib/j+k"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @TestMetadata("capturedFlexible.kt")
         public void testCapturedFlexible() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/capturedFlexible.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/capturedFlexible.kt");
         }
 
         @TestMetadata("complexFlexibleInference.kt")
         public void testComplexFlexibleInference() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/complexFlexibleInference.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/complexFlexibleInference.kt");
         }
 
         @TestMetadata("FieldAndGetter.kt")
         public void testFieldAndGetter() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/FieldAndGetter.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/FieldAndGetter.kt");
         }
 
         @TestMetadata("FieldSubstitution.kt")
         public void testFieldSubstitution() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/FieldSubstitution.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/FieldSubstitution.kt");
         }
 
         @TestMetadata("FunctionTypeInJava.kt")
         public void testFunctionTypeInJava() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/FunctionTypeInJava.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/FunctionTypeInJava.kt");
         }
 
         @TestMetadata("JavaVisibility2.kt")
         public void testJavaVisibility2() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/JavaVisibility2.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/JavaVisibility2.kt");
         }
 
         @TestMetadata("KJKComplexHierarchy.kt")
         public void testKJKComplexHierarchy() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchy.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKComplexHierarchy.kt");
         }
 
         @TestMetadata("KJKComplexHierarchyWithNested.kt")
         public void testKJKComplexHierarchyWithNested() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchyWithNested.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.kt");
         }
 
         @TestMetadata("KJKInheritance.kt")
         public void testKJKInheritance() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKInheritance.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKInheritance.kt");
         }
 
         @TestMetadata("KJKInheritanceGeneric.kt")
         public void testKJKInheritanceGeneric() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKInheritanceGeneric.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.kt");
         }
 
         @TestMetadata("KotlinClassParameter.kt")
         public void testKotlinClassParameter() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/KotlinClassParameter.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/KotlinClassParameter.kt");
         }
 
         @TestMetadata("KotlinClassParameterGeneric.kt")
         public void testKotlinClassParameterGeneric() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/KotlinClassParameterGeneric.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.kt");
         }
 
         @TestMetadata("LoggerInstance.kt")
         public void testLoggerInstance() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/LoggerInstance.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/LoggerInstance.kt");
         }
 
         @TestMetadata("MapCompute.kt")
         public void testMapCompute() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/MapCompute.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/MapCompute.kt");
         }
 
         @TestMetadata("MapEntry.kt")
         public void testMapEntry() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/MapEntry.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/MapEntry.kt");
         }
 
         @TestMetadata("MyException.kt")
         public void testMyException() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/MyException.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyException.kt");
         }
 
         @TestMetadata("MyIterable.kt")
         public void testMyIterable() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/MyIterable.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyIterable.kt");
         }
 
         @TestMetadata("MyMap.kt")
         public void testMyMap() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/MyMap.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/MyMap.kt");
         }
 
         @TestMetadata("outerInnerClasses.kt")
         public void testOuterInnerClasses() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/outerInnerClasses.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/outerInnerClasses.kt");
         }
 
         @TestMetadata("RawType.kt")
         public void testRawType() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/RawType.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/RawType.kt");
         }
 
         @TestMetadata("smartSet.kt")
         public void testSmartSet() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/smartSet.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/smartSet.kt");
         }
 
         @TestMetadata("StaticClassConstructorFromBaseClass.kt")
         public void testStaticClassConstructorFromBaseClass() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticClassConstructorFromBaseClass.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticClassConstructorFromBaseClass.kt");
         }
 
         @TestMetadata("StaticFromBaseClass.kt")
         public void testStaticFromBaseClass() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticFromBaseClass.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticFromBaseClass.kt");
         }
 
         @TestMetadata("StaticGenericMethod.kt")
         public void testStaticGenericMethod() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/StaticGenericMethod.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/StaticGenericMethod.kt");
         }
 
         @TestMetadata("SyntheticAfterFiltering.kt")
         public void testSyntheticAfterFiltering() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/SyntheticAfterFiltering.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/SyntheticAfterFiltering.kt");
         }
 
         @TestMetadata("SyntheticWithForEach.kt")
         public void testSyntheticWithForEach() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/SyntheticWithForEach.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/SyntheticWithForEach.kt");
         }
 
         @TestMetadata("typeParameterUse.kt")
         public void testTypeParameterUse() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/j+k/typeParameterUse.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/j+k/typeParameterUse.kt");
         }
     }
 
-    @TestMetadata("compiler/fir/resolve/testData/resolve/stdlib/problems")
+    @TestMetadata("compiler/fir/resolve/testData/resolveWithStdlib/problems")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Problems extends AbstractFirDiagnosticsWithStdlibTest {
@@ -629,42 +629,42 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         }
 
         public void testAllFilesPresentInProblems() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/stdlib/problems"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolveWithStdlib/problems"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @TestMetadata("cloneArray.kt")
         public void testCloneArray() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/problems/cloneArray.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems/cloneArray.kt");
         }
 
         @TestMetadata("complexSmartCasts.kt")
         public void testComplexSmartCasts() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/problems/complexSmartCasts.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems/complexSmartCasts.kt");
         }
 
         @TestMetadata("delegateTypeMismatch.kt")
         public void testDelegateTypeMismatch() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/problems/delegateTypeMismatch.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems/delegateTypeMismatch.kt");
         }
 
         @TestMetadata("inapplicableRemoveAll.kt")
         public void testInapplicableRemoveAll() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/problems/inapplicableRemoveAll.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems/inapplicableRemoveAll.kt");
         }
 
         @TestMetadata("invokePriority.kt")
         public void testInvokePriority() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/problems/invokePriority.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems/invokePriority.kt");
         }
 
         @TestMetadata("KJKComplexHierarchyNestedLoop.kt")
         public void testKJKComplexHierarchyNestedLoop() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/problems/KJKComplexHierarchyNestedLoop.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.kt");
         }
 
         @TestMetadata("weakHashMap.kt")
         public void testWeakHashMap() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/stdlib/problems/weakHashMap.kt");
+            runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems/weakHashMap.kt");
         }
     }
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
index 2b6882be803..67577443de4 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
@@ -558,14 +558,16 @@ fun main(args: Array<String>) {
             model("resolve/cfg", pattern = KT_WITHOUT_DOTS_IN_NAME)
             model("resolve/smartcasts", pattern = KT_WITHOUT_DOTS_IN_NAME)
         }
+    }
 
+    testGroup("compiler/fir/resolve/tests", "compiler/fir/resolve/testData") {
         testClass<AbstractFirDiagnosticsWithStdlibTest> {
-            model("resolve/stdlib", pattern = KT_WITHOUT_DOTS_IN_NAME, excludeDirs = listOf("contracts", "smartcasts"))
+            model("resolveWithStdlib", pattern = KT_WITHOUT_DOTS_IN_NAME, excludeDirs = listOf("contracts", "smartcasts"))
         }
 
         testClass<AbstractFirDiagnosticsWithCfgAndStdlibTest> {
-            model("resolve/stdlib/contracts", pattern = KT_WITHOUT_DOTS_IN_NAME)
-            model("resolve/stdlib/smartcasts", pattern = KT_WITHOUT_DOTS_IN_NAME)
+            model("resolveWithStdlib/contracts", pattern = KT_WITHOUT_DOTS_IN_NAME)
+            model("resolveWithStdlib/smartcasts", pattern = KT_WITHOUT_DOTS_IN_NAME)
         }
     }