diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.kt b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.txt b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.kt b/compiler/testData/diagnostics/tests/callableReference/function/callableRefrenceOnNestedObject.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/callableRefrenceOnNestedObject.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.txt b/compiler/testData/diagnostics/tests/callableReference/function/callableRefrenceOnNestedObject.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/callableRefrenceOnNestedObject.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/constructorFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/constructorFromClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/constructorFromClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/constructorFromClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.txt b/compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtensionInClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtensionInClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtensionInClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtensionInClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/constructorFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/constructorFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/constructorFromTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/constructorFromTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.txt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.kt b/compiler/testData/diagnostics/tests/callableReference/function/empty.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/empty.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.txt b/compiler/testData/diagnostics/tests/callableReference/function/empty.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/empty.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionFromClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/extensionFromClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionFromClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionFromExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.txt b/compiler/testData/diagnostics/tests/callableReference/function/extensionFromExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionFromExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionFromExtensionInClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionFromExtensionInClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/extensionFromExtensionInClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionFromExtensionInClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/extensionFromTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionFromTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.txt b/compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionOnNullable.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionOnNullable.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.txt b/compiler/testData/diagnostics/tests/callableReference/function/extensionOnNullable.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/extensionOnNullable.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/genericClassFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/genericClassFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/genericClassFromTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/genericClassFromTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.kt b/compiler/testData/diagnostics/tests/callableReference/function/importedInnerConstructor.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/importedInnerConstructor.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.txt b/compiler/testData/diagnostics/tests/callableReference/function/importedInnerConstructor.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/importedInnerConstructor.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.txt b/compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.kt b/compiler/testData/diagnostics/tests/callableReference/function/javaStaticMethod.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/javaStaticMethod.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.txt b/compiler/testData/diagnostics/tests/callableReference/function/javaStaticMethod.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/javaStaticMethod.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt b/compiler/testData/diagnostics/tests/callableReference/function/localConstructor.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/localConstructor.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.txt b/compiler/testData/diagnostics/tests/callableReference/function/localConstructor.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/localConstructor.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromExtensionInLocalClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromExtensionInLocalClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromExtensionInLocalClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromExtensionInLocalClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.txt b/compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt b/compiler/testData/diagnostics/tests/callableReference/function/localNamedFun.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/localNamedFun.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.txt b/compiler/testData/diagnostics/tests/callableReference/function/localNamedFun.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/localNamedFun.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromExtensionInLocalClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromExtensionInLocalClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromExtensionInLocalClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromExtensionInLocalClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.txt b/compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt b/compiler/testData/diagnostics/tests/callableReference/function/longQualifiedName.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/longQualifiedName.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.txt b/compiler/testData/diagnostics/tests/callableReference/function/longQualifiedName.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/longQualifiedName.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt b/compiler/testData/diagnostics/tests/callableReference/function/longQualifiedNameGeneric.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/longQualifiedNameGeneric.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.txt b/compiler/testData/diagnostics/tests/callableReference/function/longQualifiedNameGeneric.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/longQualifiedNameGeneric.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/memberFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/memberFromClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/memberFromClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/memberFromClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/memberFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/memberFromExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.txt b/compiler/testData/diagnostics/tests/callableReference/function/memberFromExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/memberFromExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/memberFromExtensionInClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/memberFromExtensionInClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/memberFromExtensionInClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/memberFromExtensionInClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/memberFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/memberFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/memberFromTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/memberFromTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.txt b/compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityLocalVsTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityLocalVsTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityLocalVsTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityLocalVsTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.txt b/compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt b/compiler/testData/diagnostics/tests/callableReference/function/renameOnImport.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/renameOnImport.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.txt b/compiler/testData/diagnostics/tests/callableReference/function/renameOnImport.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/renameOnImport.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/topLevelFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/topLevelFromClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/topLevelFromClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/topLevelFromClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt b/compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.txt b/compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtensionInClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtensionInClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtensionInClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtensionInClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/topLevelFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/topLevelFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/function/topLevelFromTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/topLevelFromTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.kt b/compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.kt
rename to compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.txt b/compiler/testData/diagnostics/tests/callableReference/function/unresolved.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.txt
rename to compiler/testData/diagnostics/tests/callableReference/function/unresolved.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt b/compiler/testData/diagnostics/tests/callableReference/property/abstractPropertyViaSubclasses.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/abstractPropertyViaSubclasses.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.txt b/compiler/testData/diagnostics/tests/callableReference/property/abstractPropertyViaSubclasses.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/abstractPropertyViaSubclasses.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt b/compiler/testData/diagnostics/tests/callableReference/property/accessViaSubclass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/accessViaSubclass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.txt b/compiler/testData/diagnostics/tests/callableReference/property/accessViaSubclass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/accessViaSubclass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt b/compiler/testData/diagnostics/tests/callableReference/property/classFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/classFromClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.txt b/compiler/testData/diagnostics/tests/callableReference/property/classFromClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/classFromClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt b/compiler/testData/diagnostics/tests/callableReference/property/extensionFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/extensionFromClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.txt b/compiler/testData/diagnostics/tests/callableReference/property/extensionFromClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/extensionFromClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.kt
similarity index 92%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.kt
index dbb76a0e063..afb67c72591 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.kt
@@ -16,7 +16,7 @@ fun test() {
     checkSubtype<KExtensionProperty<String, Int>>(f)
     checkSubtype<KMutableExtensionProperty<String, Int>>(<!TYPE_MISMATCH!>f<!>)
     checkSubtype<Int>(f.get("abc"))
-    f.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>set<!>("abc", 0)
+    f.<!UNRESOLVED_REFERENCE!>set<!>("abc", 0)
 
     val g = Int::meaning
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.kt b/compiler/testData/diagnostics/tests/callableReference/property/extensionPropertyOnNullable.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/extensionPropertyOnNullable.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.txt b/compiler/testData/diagnostics/tests/callableReference/property/extensionPropertyOnNullable.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/extensionPropertyOnNullable.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt b/compiler/testData/diagnostics/tests/callableReference/property/genericClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/genericClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.txt b/compiler/testData/diagnostics/tests/callableReference/property/genericClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/genericClass.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt b/compiler/testData/diagnostics/tests/callableReference/property/javaInstanceField.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/javaInstanceField.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.txt b/compiler/testData/diagnostics/tests/callableReference/property/javaInstanceField.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/javaInstanceField.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt b/compiler/testData/diagnostics/tests/callableReference/property/javaStaticFieldViaImport.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/javaStaticFieldViaImport.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.txt b/compiler/testData/diagnostics/tests/callableReference/property/javaStaticFieldViaImport.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/javaStaticFieldViaImport.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/kt7564.kt b/compiler/testData/diagnostics/tests/callableReference/property/kt7564.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/kt7564.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/kt7564.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/kt7564.txt b/compiler/testData/diagnostics/tests/callableReference/property/kt7564.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/kt7564.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/kt7564.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.kt b/compiler/testData/diagnostics/tests/callableReference/property/localVariable.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/localVariable.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.txt b/compiler/testData/diagnostics/tests/callableReference/property/localVariable.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/localVariable.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt b/compiler/testData/diagnostics/tests/callableReference/property/memberFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/memberFromExtension.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.txt b/compiler/testData/diagnostics/tests/callableReference/property/memberFromExtension.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/memberFromExtension.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.kt
similarity index 89%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.kt
index 8ba830c6506..14be337f739 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.kt
@@ -14,7 +14,7 @@ fun test() {
     checkSubtype<KMutableMemberProperty<A, Int>>(<!TYPE_MISMATCH!>p<!>)
     checkSubtype<Int>(p.get(A()))
     p.get(<!NO_VALUE_FOR_PARAMETER!>)<!>
-    p.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>set<!>(A(), 239)
+    p.<!UNRESOLVED_REFERENCE!>set<!>(A(), 239)
 
     val q = A::bar
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/samePriorityForFunctionsAndProperties.kt b/compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/samePriorityForFunctionsAndProperties.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/samePriorityForFunctionsAndProperties.txt b/compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/samePriorityForFunctionsAndProperties.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/property/topLevelFromTopLevel.kt
similarity index 94%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt
rename to compiler/testData/diagnostics/tests/callableReference/property/topLevelFromTopLevel.kt
index 800a8c4018a..d9fcb90c7ff 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/property/topLevelFromTopLevel.kt
@@ -31,5 +31,5 @@ fun testY() {
 
     checkSubtype<String>(yy.name)
     checkSubtype<String>(yy.get())
-    yy.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>set<!>("yy")
+    yy.<!UNRESOLVED_REFERENCE!>set<!>("yy")
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.txt b/compiler/testData/diagnostics/tests/callableReference/property/topLevelFromTopLevel.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.txt
rename to compiler/testData/diagnostics/tests/callableReference/property/topLevelFromTopLevel.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.kt b/compiler/testData/diagnostics/tests/callableReference/unused.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.kt
rename to compiler/testData/diagnostics/tests/callableReference/unused.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.txt b/compiler/testData/diagnostics/tests/callableReference/unused.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.txt
rename to compiler/testData/diagnostics/tests/callableReference/unused.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/classLiteral/arrays.kt b/compiler/testData/diagnostics/tests/classLiteral/arrays.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/classLiteral/arrays.kt
rename to compiler/testData/diagnostics/tests/classLiteral/arrays.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/classLiteral/arrays.txt b/compiler/testData/diagnostics/tests/classLiteral/arrays.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/classLiteral/arrays.txt
rename to compiler/testData/diagnostics/tests/classLiteral/arrays.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/classLiteral/genericClasses.kt b/compiler/testData/diagnostics/tests/classLiteral/genericClasses.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/classLiteral/genericClasses.kt
rename to compiler/testData/diagnostics/tests/classLiteral/genericClasses.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/classLiteral/genericClasses.txt b/compiler/testData/diagnostics/tests/classLiteral/genericClasses.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/classLiteral/genericClasses.txt
rename to compiler/testData/diagnostics/tests/classLiteral/genericClasses.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/classLiteral/nonClassesOnLHS.kt b/compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/classLiteral/nonClassesOnLHS.kt
rename to compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/classLiteral/nonClassesOnLHS.txt b/compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/classLiteral/nonClassesOnLHS.txt
rename to compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/classLiteral/simpleClassLiteral.kt b/compiler/testData/diagnostics/tests/classLiteral/simpleClassLiteral.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/classLiteral/simpleClassLiteral.kt
rename to compiler/testData/diagnostics/tests/classLiteral/simpleClassLiteral.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/classLiteral/simpleClassLiteral.txt b/compiler/testData/diagnostics/tests/classLiteral/simpleClassLiteral.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/classLiteral/simpleClassLiteral.txt
rename to compiler/testData/diagnostics/tests/classLiteral/simpleClassLiteral.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/classLiteral/unresolvedClass.kt b/compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/classLiteral/unresolvedClass.kt
rename to compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/classLiteral/unresolvedClass.txt b/compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/classLiteral/unresolvedClass.txt
rename to compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
index b0789f415e8..1a9a34832a9 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
@@ -1000,6 +1000,429 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             }
         }
 
+        @TestMetadata("compiler/testData/diagnostics/tests/callableReference")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CallableReference extends AbstractJetDiagnosticsTest {
+            public void testAllFilesPresentInCallableReference() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("unused.kt")
+            public void testUnused() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/unused.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("compiler/testData/diagnostics/tests/callableReference/function")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Function extends AbstractJetDiagnosticsTest {
+                @TestMetadata("abstractClassConstructors.kt")
+                public void testAbstractClassConstructors() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.kt");
+                    doTest(fileName);
+                }
+
+                public void testAllFilesPresentInFunction() throws Exception {
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference/function"), Pattern.compile("^(.+)\\.kt$"), true);
+                }
+
+                @TestMetadata("ambiguityTopLevelVsTopLevel.kt")
+                public void testAmbiguityTopLevelVsTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("callableRefrenceOnNestedObject.kt")
+                public void testCallableRefrenceOnNestedObject() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/callableRefrenceOnNestedObject.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("constructorFromClass.kt")
+                public void testConstructorFromClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("constructorFromExtension.kt")
+                public void testConstructorFromExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("constructorFromExtensionInClass.kt")
+                public void testConstructorFromExtensionInClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtensionInClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("constructorFromTopLevel.kt")
+                public void testConstructorFromTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("differentPackageClass.kt")
+                public void testDifferentPackageClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("differentPackageExtension.kt")
+                public void testDifferentPackageExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("differentPackageTopLevel.kt")
+                public void testDifferentPackageTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("empty.kt")
+                public void testEmpty() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/empty.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionFromClass.kt")
+                public void testExtensionFromClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionFromExtension.kt")
+                public void testExtensionFromExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionFromExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionFromExtensionInClass.kt")
+                public void testExtensionFromExtensionInClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionFromExtensionInClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionFromTopLevel.kt")
+                public void testExtensionFromTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionFromTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionInClassDisallowed.kt")
+                public void testExtensionInClassDisallowed() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionOnNullable.kt")
+                public void testExtensionOnNullable() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionOnNullable.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("genericClassFromTopLevel.kt")
+                public void testGenericClassFromTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/genericClassFromTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("importedInnerConstructor.kt")
+                public void testImportedInnerConstructor() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/importedInnerConstructor.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("innerConstructorFromClass.kt")
+                public void testInnerConstructorFromClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("innerConstructorFromExtension.kt")
+                public void testInnerConstructorFromExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("innerConstructorFromTopLevel.kt")
+                public void testInnerConstructorFromTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("javaStaticMethod.kt")
+                public void testJavaStaticMethod() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/javaStaticMethod.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("lhsNotAClass.kt")
+                public void testLhsNotAClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localConstructor.kt")
+                public void testLocalConstructor() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructor.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localConstructorFromExtensionInLocalClass.kt")
+                public void testLocalConstructorFromExtensionInLocalClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromExtensionInLocalClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localConstructorFromLocalClass.kt")
+                public void testLocalConstructorFromLocalClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localConstructorFromLocalExtension.kt")
+                public void testLocalConstructorFromLocalExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localNamedFun.kt")
+                public void testLocalNamedFun() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFun.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localNamedFunFromExtensionInLocalClass.kt")
+                public void testLocalNamedFunFromExtensionInLocalClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromExtensionInLocalClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localNamedFunFromLocalClass.kt")
+                public void testLocalNamedFunFromLocalClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localNamedFunFromLocalExtension.kt")
+                public void testLocalNamedFunFromLocalExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("longQualifiedName.kt")
+                public void testLongQualifiedName() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/longQualifiedName.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("longQualifiedNameGeneric.kt")
+                public void testLongQualifiedNameGeneric() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/longQualifiedNameGeneric.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("memberFromClass.kt")
+                public void testMemberFromClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/memberFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("memberFromExtension.kt")
+                public void testMemberFromExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/memberFromExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("memberFromExtensionInClass.kt")
+                public void testMemberFromExtensionInClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/memberFromExtensionInClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("memberFromTopLevel.kt")
+                public void testMemberFromTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/memberFromTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("nestedConstructorFromClass.kt")
+                public void testNestedConstructorFromClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("nestedConstructorFromExtension.kt")
+                public void testNestedConstructorFromExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("nestedConstructorFromTopLevel.kt")
+                public void testNestedConstructorFromTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("noAmbiguityLocalVsTopLevel.kt")
+                public void testNoAmbiguityLocalVsTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityLocalVsTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("noAmbiguityMemberVsExtension.kt")
+                public void testNoAmbiguityMemberVsExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("noAmbiguityMemberVsTopLevel.kt")
+                public void testNoAmbiguityMemberVsTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("renameOnImport.kt")
+                public void testRenameOnImport() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/renameOnImport.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("topLevelFromClass.kt")
+                public void testTopLevelFromClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("topLevelFromExtension.kt")
+                public void testTopLevelFromExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("topLevelFromExtensionInClass.kt")
+                public void testTopLevelFromExtensionInClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtensionInClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("topLevelFromTopLevel.kt")
+                public void testTopLevelFromTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("unresolved.kt")
+                public void testUnresolved() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt");
+                    doTest(fileName);
+                }
+            }
+
+            @TestMetadata("compiler/testData/diagnostics/tests/callableReference/property")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Property extends AbstractJetDiagnosticsTest {
+                @TestMetadata("abstractPropertyViaSubclasses.kt")
+                public void testAbstractPropertyViaSubclasses() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/abstractPropertyViaSubclasses.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("accessViaSubclass.kt")
+                public void testAccessViaSubclass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/accessViaSubclass.kt");
+                    doTest(fileName);
+                }
+
+                public void testAllFilesPresentInProperty() throws Exception {
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference/property"), Pattern.compile("^(.+)\\.kt$"), true);
+                }
+
+                @TestMetadata("classFromClass.kt")
+                public void testClassFromClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/classFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionFromClass.kt")
+                public void testExtensionFromClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/extensionFromClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionFromTopLevel.kt")
+                public void testExtensionFromTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("extensionPropertyOnNullable.kt")
+                public void testExtensionPropertyOnNullable() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/extensionPropertyOnNullable.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("genericClass.kt")
+                public void testGenericClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/genericClass.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("javaInstanceField.kt")
+                public void testJavaInstanceField() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/javaInstanceField.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("javaStaticFieldViaImport.kt")
+                public void testJavaStaticFieldViaImport() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/javaStaticFieldViaImport.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("kt7564.kt")
+                public void testKt7564() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/kt7564.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localVariable.kt")
+                public void testLocalVariable() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/localVariable.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("memberFromExtension.kt")
+                public void testMemberFromExtension() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/memberFromExtension.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("memberFromTopLevel.kt")
+                public void testMemberFromTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("samePriorityForFunctionsAndProperties.kt")
+                public void testSamePriorityForFunctionsAndProperties() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("topLevelFromTopLevel.kt")
+                public void testTopLevelFromTopLevel() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/topLevelFromTopLevel.kt");
+                    doTest(fileName);
+                }
+            }
+        }
+
         @TestMetadata("compiler/testData/diagnostics/tests/cast")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -1468,6 +1891,45 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             }
         }
 
+        @TestMetadata("compiler/testData/diagnostics/tests/classLiteral")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class ClassLiteral extends AbstractJetDiagnosticsTest {
+            public void testAllFilesPresentInClassLiteral() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/classLiteral"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("arrays.kt")
+            public void testArrays() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/arrays.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("genericClasses.kt")
+            public void testGenericClasses() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/genericClasses.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("nonClassesOnLHS.kt")
+            public void testNonClassesOnLHS() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simpleClassLiteral.kt")
+            public void testSimpleClassLiteral() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/simpleClassLiteral.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("unresolvedClass.kt")
+            public void testUnresolvedClass() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.kt");
+                doTest(fileName);
+            }
+        }
+
         @TestMetadata("compiler/testData/diagnostics/tests/classObjects")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java
index a4f75d0b9e1..d93a9e131f3 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java
@@ -536,468 +536,6 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         }
     }
 
-    @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class CallableReference extends AbstractJetDiagnosticsTestWithStdLib {
-        public void testAllFilesPresentInCallableReference() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-
-        @TestMetadata("unused.kt")
-        public void testUnused() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Function extends AbstractJetDiagnosticsTestWithStdLib {
-            @TestMetadata("abstractClassConstructors.kt")
-            public void testAbstractClassConstructors() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.kt");
-                doTest(fileName);
-            }
-
-            public void testAllFilesPresentInFunction() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/callableReference/function"), Pattern.compile("^(.+)\\.kt$"), true);
-            }
-
-            @TestMetadata("ambiguityTopLevelVsTopLevel.kt")
-            public void testAmbiguityTopLevelVsTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("callableRefrenceOnNestedObject.kt")
-            public void testCallableRefrenceOnNestedObject() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("constructorFromClass.kt")
-            public void testConstructorFromClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("constructorFromExtension.kt")
-            public void testConstructorFromExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("constructorFromExtensionInClass.kt")
-            public void testConstructorFromExtensionInClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("constructorFromTopLevel.kt")
-            public void testConstructorFromTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("differentPackageClass.kt")
-            public void testDifferentPackageClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("differentPackageExtension.kt")
-            public void testDifferentPackageExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("differentPackageTopLevel.kt")
-            public void testDifferentPackageTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("empty.kt")
-            public void testEmpty() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionFromClass.kt")
-            public void testExtensionFromClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionFromExtension.kt")
-            public void testExtensionFromExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionFromExtensionInClass.kt")
-            public void testExtensionFromExtensionInClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionFromTopLevel.kt")
-            public void testExtensionFromTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionInClassDisallowed.kt")
-            public void testExtensionInClassDisallowed() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionOnNullable.kt")
-            public void testExtensionOnNullable() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("genericClassFromTopLevel.kt")
-            public void testGenericClassFromTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("importedInnerConstructor.kt")
-            public void testImportedInnerConstructor() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("innerConstructorFromClass.kt")
-            public void testInnerConstructorFromClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("innerConstructorFromExtension.kt")
-            public void testInnerConstructorFromExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("innerConstructorFromTopLevel.kt")
-            public void testInnerConstructorFromTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("javaStaticMethod.kt")
-            public void testJavaStaticMethod() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("lhsNotAClass.kt")
-            public void testLhsNotAClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localConstructor.kt")
-            public void testLocalConstructor() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localConstructorFromExtensionInLocalClass.kt")
-            public void testLocalConstructorFromExtensionInLocalClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localConstructorFromLocalClass.kt")
-            public void testLocalConstructorFromLocalClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localConstructorFromLocalExtension.kt")
-            public void testLocalConstructorFromLocalExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localNamedFun.kt")
-            public void testLocalNamedFun() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localNamedFunFromExtensionInLocalClass.kt")
-            public void testLocalNamedFunFromExtensionInLocalClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localNamedFunFromLocalClass.kt")
-            public void testLocalNamedFunFromLocalClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localNamedFunFromLocalExtension.kt")
-            public void testLocalNamedFunFromLocalExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("longQualifiedName.kt")
-            public void testLongQualifiedName() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("longQualifiedNameGeneric.kt")
-            public void testLongQualifiedNameGeneric() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("memberFromClass.kt")
-            public void testMemberFromClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("memberFromExtension.kt")
-            public void testMemberFromExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("memberFromExtensionInClass.kt")
-            public void testMemberFromExtensionInClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("memberFromTopLevel.kt")
-            public void testMemberFromTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("nestedConstructorFromClass.kt")
-            public void testNestedConstructorFromClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("nestedConstructorFromExtension.kt")
-            public void testNestedConstructorFromExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("nestedConstructorFromTopLevel.kt")
-            public void testNestedConstructorFromTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("noAmbiguityLocalVsTopLevel.kt")
-            public void testNoAmbiguityLocalVsTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("noAmbiguityMemberVsExtension.kt")
-            public void testNoAmbiguityMemberVsExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("noAmbiguityMemberVsTopLevel.kt")
-            public void testNoAmbiguityMemberVsTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("renameOnImport.kt")
-            public void testRenameOnImport() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("topLevelFromClass.kt")
-            public void testTopLevelFromClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("topLevelFromExtension.kt")
-            public void testTopLevelFromExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("topLevelFromExtensionInClass.kt")
-            public void testTopLevelFromExtensionInClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("topLevelFromTopLevel.kt")
-            public void testTopLevelFromTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("unresolved.kt")
-            public void testUnresolved() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.kt");
-                doTest(fileName);
-            }
-        }
-
-        @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Property extends AbstractJetDiagnosticsTestWithStdLib {
-            @TestMetadata("abstractPropertyViaSubclasses.kt")
-            public void testAbstractPropertyViaSubclasses() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("accessViaSubclass.kt")
-            public void testAccessViaSubclass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt");
-                doTest(fileName);
-            }
-
-            public void testAllFilesPresentInProperty() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/callableReference/property"), Pattern.compile("^(.+)\\.kt$"), true);
-            }
-
-            @TestMetadata("classFromClass.kt")
-            public void testClassFromClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionFromClass.kt")
-            public void testExtensionFromClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionFromTopLevel.kt")
-            public void testExtensionFromTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionPropertyOnNullable.kt")
-            public void testExtensionPropertyOnNullable() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("genericClass.kt")
-            public void testGenericClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("javaInstanceField.kt")
-            public void testJavaInstanceField() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("javaStaticFieldViaImport.kt")
-            public void testJavaStaticFieldViaImport() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("kt7564.kt")
-            public void testKt7564() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/kt7564.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localVariable.kt")
-            public void testLocalVariable() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("memberFromExtension.kt")
-            public void testMemberFromExtension() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("memberFromTopLevel.kt")
-            public void testMemberFromTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("samePriorityForFunctionsAndProperties.kt")
-            public void testSamePriorityForFunctionsAndProperties() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/samePriorityForFunctionsAndProperties.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("topLevelFromTopLevel.kt")
-            public void testTopLevelFromTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt");
-                doTest(fileName);
-            }
-        }
-    }
-
-    @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/classLiteral")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class ClassLiteral extends AbstractJetDiagnosticsTestWithStdLib {
-        public void testAllFilesPresentInClassLiteral() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/classLiteral"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-
-        @TestMetadata("arrays.kt")
-        public void testArrays() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/classLiteral/arrays.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("genericClasses.kt")
-        public void testGenericClasses() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/classLiteral/genericClasses.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("nonClassesOnLHS.kt")
-        public void testNonClassesOnLHS() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/classLiteral/nonClassesOnLHS.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("simpleClassLiteral.kt")
-        public void testSimpleClassLiteral() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/classLiteral/simpleClassLiteral.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("unresolvedClass.kt")
-        public void testUnresolvedClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/classLiteral/unresolvedClass.kt");
-            doTest(fileName);
-        }
-    }
-
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)