diff --git a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPUnitTestSuite.kt b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPUnitTestSuite.kt
index 776289b..2e07659 100644
--- a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPUnitTestSuite.kt
+++ b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPUnitTestSuite.kt
@@ -35,37 +35,36 @@
 
     companion object {
         internal const val AA_PATH: String = "../kotlin-analysis-api/testData"
-        internal const val UTIL_PATH: String = "../test-utils/testData/api"
     }
 
     @TestMetadata("annotatedUtil.kt")
     @Test
     fun testAnnotatedUtil() {
-        runTest("$UTIL_PATH/annotatedUtil.kt")
+        runTest("$AA_PATH/annotatedUtil.kt")
     }
 
     @TestMetadata("javaAnnotatedUtil.kt")
     @Test
     fun testJavaAnnotatedUtil() {
-        runTest("$UTIL_PATH/javaAnnotatedUtil.kt")
+        runTest("$AA_PATH/javaAnnotatedUtil.kt")
     }
 
     @TestMetadata("abstractFunctions.kt")
     @Test
     fun testAbstractFunctions() {
-        runTest("$UTIL_PATH/abstractFunctions.kt")
+        runTest("$AA_PATH/abstractFunctions.kt")
     }
 
     @TestMetadata("allFunctions_java_inherits_kt.kt")
     @Test
     fun testAllFunctions_java_inherits_kt() {
-        runTest("$UTIL_PATH/allFunctions_java_inherits_kt.kt")
+        runTest("$AA_PATH/allFunctions_java_inherits_kt.kt")
     }
 
     @TestMetadata("allFunctions_kotlin.kt")
     @Test
     fun testAllFunctions_kotlin() {
-        runTest("$UTIL_PATH/allFunctions_java_inherits_kt.kt")
+        runTest("$AA_PATH/allFunctions_java_inherits_kt.kt")
     }
 
     @TestMetadata("allFunctions_kt_inherits_java.kt")
@@ -87,13 +86,13 @@
     @TestMetadata("annotationOnConstructorParameter.kt")
     @Test
     fun testAnnotationOnConstructorParameter() {
-        runTest("$UTIL_PATH/annotationOnConstructorParameter.kt")
+        runTest("$AA_PATH/annotationOnConstructorParameter.kt")
     }
 
     @TestMetadata("annotationOnReceiver.kt")
     @Test
     fun testAnnotationOnReceiver() {
-        runTest("$UTIL_PATH/annotationOnReceiver.kt")
+        runTest("$AA_PATH/annotationOnReceiver.kt")
     }
 
     @TestMetadata("annotationsRepeatable.kt")
@@ -105,19 +104,19 @@
     @TestMetadata("annotationTargets.kt")
     @Test
     fun testAnnotationTargets() {
-        runTest("$UTIL_PATH/annotationTargets.kt")
+        runTest("$AA_PATH/annotationTargets.kt")
     }
 
     @TestMetadata("annotationWithArbitraryClassValue.kt")
     @Test
     fun testAnnotationWithArbitraryClassValue() {
-        runTest("$UTIL_PATH/annotationWithArbitraryClassValue.kt")
+        runTest("$AA_PATH/annotationWithArbitraryClassValue.kt")
     }
 
     @TestMetadata("annotationWithNestedClassValue.kt")
     @Test
     fun testAnnotationWithNestedClassValue() {
-        runTest("$UTIL_PATH/annotationWithNestedClassValue.kt")
+        runTest("$AA_PATH/annotationWithNestedClassValue.kt")
     }
 
     @TestMetadata("defaultKClassValue.kt")
@@ -147,7 +146,7 @@
     @TestMetadata("annotationWithArrayValue.kt")
     @Test
     fun testAnnotationWithArrayValue() {
-        runTest("$UTIL_PATH/annotationWithArrayValue.kt")
+        runTest("$AA_PATH/annotationWithArrayValue.kt")
     }
 
     @TestMetadata("annotationWithDefault.kt")
@@ -165,7 +164,7 @@
     @TestMetadata("annotationWithJavaTypeValue.kt")
     @Test
     fun testAnnotationWithJavaTypeValue() {
-        runTest("$UTIL_PATH/annotationWithJavaTypeValue.kt")
+        runTest("$AA_PATH/annotationWithJavaTypeValue.kt")
     }
 
     @TestMetadata("asMemberOf.kt")
@@ -177,25 +176,25 @@
     @TestMetadata("backingFields.kt")
     @Test
     fun testBackingFields() {
-        runTest("$UTIL_PATH/backingFields.kt")
+        runTest("$AA_PATH/backingFields.kt")
     }
 
     @TestMetadata("builtInTypes.kt")
     @Test
     fun testBuiltInTypes() {
-        runTest("$UTIL_PATH/builtInTypes.kt")
+        runTest("$AA_PATH/builtInTypes.kt")
     }
 
     @TestMetadata("objCacheA.kt")
     @Test
     fun testObjCacheA() {
-        runTest("$UTIL_PATH/objCacheA.kt")
+        runTest("$AA_PATH/objCacheA.kt")
     }
 
     @TestMetadata("objCacheB.kt")
     @Test
     fun testObjCacheB() {
-        runTest("$UTIL_PATH/objCacheB.kt")
+        runTest("$AA_PATH/objCacheB.kt")
     }
 
     @TestMetadata("checkOverride.kt")
@@ -207,55 +206,55 @@
     @TestMetadata("classKinds.kt")
     @Test
     fun testClassKinds() {
-        runTest("$UTIL_PATH/classKinds.kt")
+        runTest("$AA_PATH/classKinds.kt")
     }
 
     @TestMetadata("companion.kt")
     @Test
     fun testCompanion() {
-        runTest("$UTIL_PATH/companion.kt")
+        runTest("$AA_PATH/companion.kt")
     }
 
     @TestMetadata("constProperties.kt")
     @Test
     fun testConstProperties() {
-        runTest("$UTIL_PATH/constProperties.kt")
+        runTest("$AA_PATH/constProperties.kt")
     }
 
     @TestMetadata("constructorDeclarations.kt")
     @Test
     fun testConstructorDeclarations() {
-        runTest("$UTIL_PATH/constructorDeclarations.kt")
+        runTest("$AA_PATH/constructorDeclarations.kt")
     }
 
     @TestMetadata("crossModuleTypeAlias.kt")
     @Test
     fun testCrossModuleTypeAlias() {
-        runTest("$UTIL_PATH/crossModuleTypeAlias.kt")
+        runTest("$AA_PATH/crossModuleTypeAlias.kt")
     }
 
     @TestMetadata("declarationInconsistency.kt")
     @Test
     fun testDeclarationInconsistency() {
-        runTest("$UTIL_PATH/declarationInconsistency.kt")
+        runTest("$AA_PATH/declarationInconsistency.kt")
     }
 
     @TestMetadata("declarationPackageName.kt")
     @Test
     fun testDeclarationPackageName() {
-        runTest("$UTIL_PATH/declarationPackageName.kt")
+        runTest("$AA_PATH/declarationPackageName.kt")
     }
 
     @TestMetadata("declarationsInAccessor.kt")
     @Test
     fun testDeclarationsInAccessor() {
-        runTest("$UTIL_PATH/declarationsInAccessor.kt")
+        runTest("$AA_PATH/declarationsInAccessor.kt")
     }
 
     @TestMetadata("declarationsInClass.kt")
     @Test
     fun testDeclarationsInClass() {
-        runTest("$UTIL_PATH/declarationsInClass.kt")
+        runTest("$AA_PATH/declarationsInClass.kt")
     }
 
     @TestMetadata("declarationOrder.kt")
@@ -273,19 +272,19 @@
     @TestMetadata("declared.kt")
     @Test
     fun testDeclared() {
-        runTest("$UTIL_PATH/declared.kt")
+        runTest("$AA_PATH/declared.kt")
     }
 
     @TestMetadata("docString.kt")
     @Test
     fun testDocString() {
-        runTest("$UTIL_PATH/docString.kt")
+        runTest("$AA_PATH/docString.kt")
     }
 
     @TestMetadata("equals.kt")
     @Test
     fun testEquals() {
-        runTest("$UTIL_PATH/equals.kt")
+        runTest("$AA_PATH/equals.kt")
     }
 
     @TestMetadata("equivalentJavaWildcards.kt")
@@ -320,31 +319,31 @@
     @TestMetadata("functionTypeAlias.kt")
     @Test
     fun testFunctionTypeAlias() {
-        runTest("$UTIL_PATH/functionTypeAlias.kt")
+        runTest("$AA_PATH/functionTypeAlias.kt")
     }
 
     @TestMetadata("functionTypeAnnotation.kt")
     @Test
     fun testFunctionTypeAnnotation() {
-        runTest("$UTIL_PATH/functionTypeAnnotation.kt")
+        runTest("$AA_PATH/functionTypeAnnotation.kt")
     }
 
     @TestMetadata("functionTypes.kt")
     @Test
     fun testFunctionTypes() {
-        runTest("$UTIL_PATH/functionTypes.kt")
+        runTest("$AA_PATH/functionTypes.kt")
     }
 
     @TestMetadata("functionKinds.kt")
     @Test
     fun testFunctionKinds() {
-        runTest("$UTIL_PATH/functionKinds.kt")
+        runTest("$AA_PATH/functionKinds.kt")
     }
 
     @TestMetadata("getAnnotationByTypeWithInnerDefault.kt")
     @Test
     fun testGetAnnotationByTypeWithInnerDefault() {
-        runTest("$UTIL_PATH/getAnnotationByTypeWithInnerDefault.kt")
+        runTest("$AA_PATH/getAnnotationByTypeWithInnerDefault.kt")
     }
 
     @TestMetadata("getPackage.kt")
@@ -356,7 +355,7 @@
     @TestMetadata("getByName.kt")
     @Test
     fun testGetByName() {
-        runTest("$UTIL_PATH/getByName.kt")
+        runTest("$AA_PATH/getByName.kt")
     }
 
     @TestMetadata("getSymbolsFromAnnotation.kt")
@@ -386,13 +385,13 @@
     @TestMetadata("hello.kt")
     @Test
     fun testHello() {
-        runTest("$UTIL_PATH/hello.kt")
+        runTest("$AA_PATH/hello.kt")
     }
 
     @TestMetadata("implicitElements.kt")
     @Test
     fun testImplicitElements() {
-        runTest("$UTIL_PATH/implicitElements.kt")
+        runTest("$AA_PATH/implicitElements.kt")
     }
 
     @TestMetadata("implicitPropertyAccessors.kt")
@@ -404,13 +403,13 @@
     @TestMetadata("internalOfFriends.kt")
     @Test
     fun testInternalOfFriends() {
-        runTest("$UTIL_PATH/internalOfFriends.kt")
+        runTest("$AA_PATH/internalOfFriends.kt")
     }
 
     @TestMetadata("inheritedTypeAlias.kt")
     @Test
     fun testInheritedTypeAlias() {
-        runTest("$UTIL_PATH/inheritedTypeAlias.kt")
+        runTest("$AA_PATH/inheritedTypeAlias.kt")
     }
 
     @TestMetadata("innerTypes.kt")
@@ -422,13 +421,13 @@
     @TestMetadata("interfaceWithDefault.kt")
     @Test
     fun testInterfaceWithDefault() {
-        runTest("$UTIL_PATH/interfaceWithDefault.kt")
+        runTest("$AA_PATH/interfaceWithDefault.kt")
     }
 
     @TestMetadata("isMutable.kt")
     @Test
     fun testIsMutable() {
-        runTest("$UTIL_PATH/isMutable.kt")
+        runTest("$AA_PATH/isMutable.kt")
     }
 
     @TestMetadata("javaModifiers.kt")
@@ -440,13 +439,13 @@
     @TestMetadata("javaNonNullTypes.kt")
     @Test
     fun testJavaNonNullTypes() {
-        runTest("$UTIL_PATH/javaNonNullTypes.kt")
+        runTest("$AA_PATH/javaNonNullTypes.kt")
     }
 
     @TestMetadata("javaSubtype.kt")
     @Test
     fun testJavaSubtype() {
-        runTest("$UTIL_PATH/javaSubtype.kt")
+        runTest("$AA_PATH/javaSubtype.kt")
     }
 
     @Bug("https://github.com/google/ksp/issues/2925", BugState.OPEN)
@@ -455,19 +454,19 @@
     @TestMetadata("javaToKotlinMapper.kt")
     @Test
     fun testJavaToKotlinMapper() {
-        runTest("$UTIL_PATH/javaToKotlinMapper.kt")
+        runTest("$AA_PATH/javaToKotlinMapper.kt")
     }
 
     @TestMetadata("javaTypes.kt")
     @Test
     fun testJavaTypes() {
-        runTest("$UTIL_PATH/javaTypes.kt")
+        runTest("$AA_PATH/javaTypes.kt")
     }
 
     @TestMetadata("javaTypes2.kt")
     @Test
     fun testJavaTypes2() {
-        runTest("$UTIL_PATH/javaTypes2.kt")
+        runTest("$AA_PATH/javaTypes2.kt")
     }
 
     @TestMetadata("javaWildcards2.kt")
@@ -485,7 +484,7 @@
     @TestMetadata("lateinitProperties.kt")
     @Test
     fun testLateinitProperties() {
-        runTest("$UTIL_PATH/lateinitProperties.kt")
+        runTest("$AA_PATH/lateinitProperties.kt")
     }
 
     @TestMetadata("libOrigins.kt")
@@ -515,7 +514,7 @@
     @TestMetadata("makeNullable.kt")
     @Test
     fun testMakeNullable() {
-        runTest("$UTIL_PATH/makeNullable.kt")
+        runTest("$AA_PATH/makeNullable.kt")
     }
 
     @TestMetadata("mangledNames.kt")
@@ -533,13 +532,13 @@
     @TestMetadata("multipleModules.kt")
     @Test
     fun testMultipleModules() {
-        runTest("$UTIL_PATH/multipleModules.kt")
+        runTest("$AA_PATH/multipleModules.kt")
     }
 
     @TestMetadata("nestedAnnotations.kt")
     @Test
     fun testNestedAnnotations() {
-        runTest("$UTIL_PATH/nestedAnnotations.kt")
+        runTest("$AA_PATH/nestedAnnotations.kt")
     }
 
     @TestMetadata("nestedClassType.kt")
@@ -551,19 +550,19 @@
     @TestMetadata("nullableTypes.kt")
     @Test
     fun testNullableTypes() {
-        runTest("$UTIL_PATH/nullableTypes.kt")
+        runTest("$AA_PATH/nullableTypes.kt")
     }
 
     @TestMetadata("conflictingOverride.kt")
     @Test
     fun testConflictingOverride() {
-        runTest("$UTIL_PATH/overridee/conflictingOverride.kt")
+        runTest("$AA_PATH/overridee/conflictingOverride.kt")
     }
 
     @TestMetadata("javaAccessor.kt")
     @Test
     fun testJavaAccessor() {
-        runTest("$UTIL_PATH/overridee/javaAccessor.kt")
+        runTest("$AA_PATH/overridee/javaAccessor.kt")
     }
 
     @TestMetadata("javaAnno.kt")
@@ -575,25 +574,25 @@
     @TestMetadata("javaOverrideInSource.kt")
     @Test
     fun testJavaOverrideInSource() {
-        runTest("$UTIL_PATH/overridee/javaOverrideInSource.kt")
+        runTest("$AA_PATH/overridee/javaOverrideInSource.kt")
     }
 
     @TestMetadata("noOverride.kt")
     @Test
     fun testNoOverride() {
-        runTest("$UTIL_PATH/overridee/noOverride.kt")
+        runTest("$AA_PATH/overridee/noOverride.kt")
     }
 
     @TestMetadata("overrideInLib.kt")
     @Test
     fun testOverrideInLib() {
-        runTest("$UTIL_PATH/overridee/overrideInLib.kt")
+        runTest("$AA_PATH/overridee/overrideInLib.kt")
     }
 
     @TestMetadata("overrideInSource.kt")
     @Test
     fun testOverrideInSource() {
-        runTest("$UTIL_PATH/overridee/overrideInSource.kt")
+        runTest("$AA_PATH/overridee/overrideInSource.kt")
     }
 
     @TestMetadata("overrideOrder.kt")
@@ -605,19 +604,19 @@
     @TestMetadata("packageAnnotations.kt")
     @Test
     fun testPackageAnnotation() {
-        runTest("$UTIL_PATH/packageAnnotations.kt")
+        runTest("$AA_PATH/packageAnnotations.kt")
     }
 
     @TestMetadata("primaryConstructorOverride.kt")
     @Test
     fun testPrimaryConstructorOverride() {
-        runTest("$UTIL_PATH/overridee/primaryConstructorOverride.kt")
+        runTest("$AA_PATH/overridee/primaryConstructorOverride.kt")
     }
 
     @TestMetadata("parameterTypes.kt")
     @Test
     fun testParameterTypes() {
-        runTest("$UTIL_PATH/parameterTypes.kt")
+        runTest("$AA_PATH/parameterTypes.kt")
     }
 
     @TestMetadata("parent.kt")
@@ -630,13 +629,13 @@
     @TestMetadata("platformDeclaration.kt")
     @Test
     fun testPlatformDeclaration() {
-        runTest("$UTIL_PATH/platformDeclaration.kt")
+        runTest("$AA_PATH/platformDeclaration.kt")
     }
 
     @TestMetadata("rawTypes.kt")
     @Test
     fun testRawTypes() {
-        runTest("$UTIL_PATH/rawTypes.kt")
+        runTest("$AA_PATH/rawTypes.kt")
     }
 
     @DisabledOnOs(OS.WINDOWS)
@@ -709,7 +708,7 @@
     @TestMetadata("sealedClass.kt")
     @Test
     fun testSealedClass() {
-        runTest("$UTIL_PATH/sealedClass.kt")
+        runTest("$AA_PATH/sealedClass.kt")
     }
 
     @TestMetadata("shadowingAnnotations.kt")
@@ -727,19 +726,19 @@
     @TestMetadata("superTypes.kt")
     @Test
     fun testSuperTypes() {
-        runTest("$UTIL_PATH/superTypes.kt")
+        runTest("$AA_PATH/superTypes.kt")
     }
 
     @TestMetadata("throwList.kt")
     @Test
     fun testThrowList() {
-        runTest("$UTIL_PATH/throwList.kt")
+        runTest("$AA_PATH/throwList.kt")
     }
 
     @TestMetadata("topLevelMembers.kt")
     @Test
     fun testTopLevelMembers() {
-        runTest("$UTIL_PATH/topLevelMembers.kt")
+        runTest("$AA_PATH/topLevelMembers.kt")
     }
 
     @TestMetadata("typeAlias.kt")
@@ -757,19 +756,19 @@
     @TestMetadata("typeAliasComparison.kt")
     @Test
     fun testTypeAliasComparison() {
-        runTest("$UTIL_PATH/typeAliasComparison.kt")
+        runTest("$AA_PATH/typeAliasComparison.kt")
     }
 
     @TestMetadata("typeComposure.kt")
     @Test
     fun testTypeComposure() {
-        runTest("$UTIL_PATH/typeComposure.kt")
+        runTest("$AA_PATH/typeComposure.kt")
     }
 
     @TestMetadata("typeComparison2.kt")
     @Test
     fun testTypeComparison2() {
-        runTest("$UTIL_PATH/typeComparison2.kt")
+        runTest("$AA_PATH/typeComparison2.kt")
     }
 
     @TestMetadata("typeParameterReference.kt")
@@ -799,19 +798,19 @@
     @TestMetadata("varianceTypeCheck.kt")
     @Test
     fun testVarianceTypeCheck() {
-        runTest("$UTIL_PATH/varianceTypeCheck.kt")
+        runTest("$AA_PATH/varianceTypeCheck.kt")
     }
 
     @TestMetadata("validateTypes.kt")
     @Test
     fun testValidateTypes() {
-        runTest("$UTIL_PATH/validateTypes.kt")
+        runTest("$AA_PATH/validateTypes.kt")
     }
 
     @TestMetadata("vararg.kt")
     @Test
     fun testVararg() {
-        runTest("$UTIL_PATH/vararg.kt")
+        runTest("$AA_PATH/vararg.kt")
     }
 
     @TestMetadata("visibilities.kt")
@@ -823,37 +822,37 @@
     @TestMetadata("multipleround.kt")
     @Test
     fun testMultipleround() {
-        runTest("$UTIL_PATH/multipleround.kt")
+        runTest("$AA_PATH/multipleround.kt")
     }
 
     @TestMetadata("deferredSymbols.kt")
     @Test
     fun testDeferredSymbols() {
-        runTest("$UTIL_PATH/deferredSymbols.kt")
+        runTest("$AA_PATH/deferredSymbols.kt")
     }
 
     @TestMetadata("deferredJavaSymbols.kt")
     @Test
     fun testDeferredJavaSymbols() {
-        runTest("$UTIL_PATH/deferredJavaSymbols.kt")
+        runTest("$AA_PATH/deferredJavaSymbols.kt")
     }
 
     @Disabled
     @TestMetadata("deferredTypeRefs.kt")
     @Test
     fun testDeferredTypeRefs() {
-        runTest("$UTIL_PATH/deferredTypeRefs.kt")
+        runTest("$AA_PATH/deferredTypeRefs.kt")
     }
 
     @TestMetadata("exitCode.kt")
     @Test
     fun testExitCode() {
-        runTest("$UTIL_PATH/exitCode.kt")
+        runTest("$AA_PATH/exitCode.kt")
     }
 
     @TestMetadata("packageProviderForGenerated.kt")
     @Test
     fun testPackageProviderForGenerated() {
-        runTest("$UTIL_PATH/packageProviderForGenerated.kt")
+        runTest("$AA_PATH/packageProviderForGenerated.kt")
     }
 }
diff --git a/test-utils/testData/api/abstractFunctions.kt b/kotlin-analysis-api/testData/abstractFunctions.kt
similarity index 100%
rename from test-utils/testData/api/abstractFunctions.kt
rename to kotlin-analysis-api/testData/abstractFunctions.kt
diff --git a/test-utils/testData/api/allFunctions_java_inherits_kt.kt b/kotlin-analysis-api/testData/allFunctions_java_inherits_kt.kt
similarity index 100%
rename from test-utils/testData/api/allFunctions_java_inherits_kt.kt
rename to kotlin-analysis-api/testData/allFunctions_java_inherits_kt.kt
diff --git a/test-utils/testData/api/annotatedUtil.kt b/kotlin-analysis-api/testData/annotatedUtil.kt
similarity index 100%
rename from test-utils/testData/api/annotatedUtil.kt
rename to kotlin-analysis-api/testData/annotatedUtil.kt
diff --git a/test-utils/testData/api/annotationOnConstructorParameter.kt b/kotlin-analysis-api/testData/annotationOnConstructorParameter.kt
similarity index 100%
rename from test-utils/testData/api/annotationOnConstructorParameter.kt
rename to kotlin-analysis-api/testData/annotationOnConstructorParameter.kt
diff --git a/test-utils/testData/api/annotationOnReceiver.kt b/kotlin-analysis-api/testData/annotationOnReceiver.kt
similarity index 100%
rename from test-utils/testData/api/annotationOnReceiver.kt
rename to kotlin-analysis-api/testData/annotationOnReceiver.kt
diff --git a/test-utils/testData/api/annotationTargets.kt b/kotlin-analysis-api/testData/annotationTargets.kt
similarity index 100%
rename from test-utils/testData/api/annotationTargets.kt
rename to kotlin-analysis-api/testData/annotationTargets.kt
diff --git a/test-utils/testData/api/annotationWithArbitraryClassValue.kt b/kotlin-analysis-api/testData/annotationWithArbitraryClassValue.kt
similarity index 100%
rename from test-utils/testData/api/annotationWithArbitraryClassValue.kt
rename to kotlin-analysis-api/testData/annotationWithArbitraryClassValue.kt
diff --git a/test-utils/testData/api/annotationWithArrayValue.kt b/kotlin-analysis-api/testData/annotationWithArrayValue.kt
similarity index 100%
rename from test-utils/testData/api/annotationWithArrayValue.kt
rename to kotlin-analysis-api/testData/annotationWithArrayValue.kt
diff --git a/test-utils/testData/api/annotationWithJavaTypeValue.kt b/kotlin-analysis-api/testData/annotationWithJavaTypeValue.kt
similarity index 100%
rename from test-utils/testData/api/annotationWithJavaTypeValue.kt
rename to kotlin-analysis-api/testData/annotationWithJavaTypeValue.kt
diff --git a/test-utils/testData/api/annotationWithNestedClassValue.kt b/kotlin-analysis-api/testData/annotationWithNestedClassValue.kt
similarity index 100%
rename from test-utils/testData/api/annotationWithNestedClassValue.kt
rename to kotlin-analysis-api/testData/annotationWithNestedClassValue.kt
diff --git a/test-utils/testData/api/backingFields.kt b/kotlin-analysis-api/testData/backingFields.kt
similarity index 100%
rename from test-utils/testData/api/backingFields.kt
rename to kotlin-analysis-api/testData/backingFields.kt
diff --git a/test-utils/testData/api/builtInTypes.kt b/kotlin-analysis-api/testData/builtInTypes.kt
similarity index 100%
rename from test-utils/testData/api/builtInTypes.kt
rename to kotlin-analysis-api/testData/builtInTypes.kt
diff --git a/test-utils/testData/api/classKinds.kt b/kotlin-analysis-api/testData/classKinds.kt
similarity index 100%
rename from test-utils/testData/api/classKinds.kt
rename to kotlin-analysis-api/testData/classKinds.kt
diff --git a/test-utils/testData/api/companion.kt b/kotlin-analysis-api/testData/companion.kt
similarity index 100%
rename from test-utils/testData/api/companion.kt
rename to kotlin-analysis-api/testData/companion.kt
diff --git a/test-utils/testData/api/constProperties.kt b/kotlin-analysis-api/testData/constProperties.kt
similarity index 100%
rename from test-utils/testData/api/constProperties.kt
rename to kotlin-analysis-api/testData/constProperties.kt
diff --git a/test-utils/testData/api/constructorDeclarations.kt b/kotlin-analysis-api/testData/constructorDeclarations.kt
similarity index 100%
rename from test-utils/testData/api/constructorDeclarations.kt
rename to kotlin-analysis-api/testData/constructorDeclarations.kt
diff --git a/test-utils/testData/api/crossModuleTypeAlias.kt b/kotlin-analysis-api/testData/crossModuleTypeAlias.kt
similarity index 100%
rename from test-utils/testData/api/crossModuleTypeAlias.kt
rename to kotlin-analysis-api/testData/crossModuleTypeAlias.kt
diff --git a/test-utils/testData/api/declarationInconsistency.kt b/kotlin-analysis-api/testData/declarationInconsistency.kt
similarity index 100%
rename from test-utils/testData/api/declarationInconsistency.kt
rename to kotlin-analysis-api/testData/declarationInconsistency.kt
diff --git a/test-utils/testData/api/declarationPackageName.kt b/kotlin-analysis-api/testData/declarationPackageName.kt
similarity index 100%
rename from test-utils/testData/api/declarationPackageName.kt
rename to kotlin-analysis-api/testData/declarationPackageName.kt
diff --git a/test-utils/testData/api/declarationsInAccessor.kt b/kotlin-analysis-api/testData/declarationsInAccessor.kt
similarity index 100%
rename from test-utils/testData/api/declarationsInAccessor.kt
rename to kotlin-analysis-api/testData/declarationsInAccessor.kt
diff --git a/test-utils/testData/api/declarationsInClass.kt b/kotlin-analysis-api/testData/declarationsInClass.kt
similarity index 100%
rename from test-utils/testData/api/declarationsInClass.kt
rename to kotlin-analysis-api/testData/declarationsInClass.kt
diff --git a/test-utils/testData/api/declared.kt b/kotlin-analysis-api/testData/declared.kt
similarity index 100%
rename from test-utils/testData/api/declared.kt
rename to kotlin-analysis-api/testData/declared.kt
diff --git a/test-utils/testData/api/deferredJavaSymbols.kt b/kotlin-analysis-api/testData/deferredJavaSymbols.kt
similarity index 100%
rename from test-utils/testData/api/deferredJavaSymbols.kt
rename to kotlin-analysis-api/testData/deferredJavaSymbols.kt
diff --git a/test-utils/testData/api/deferredSymbols.kt b/kotlin-analysis-api/testData/deferredSymbols.kt
similarity index 100%
rename from test-utils/testData/api/deferredSymbols.kt
rename to kotlin-analysis-api/testData/deferredSymbols.kt
diff --git a/test-utils/testData/api/docString.kt b/kotlin-analysis-api/testData/docString.kt
similarity index 100%
rename from test-utils/testData/api/docString.kt
rename to kotlin-analysis-api/testData/docString.kt
diff --git a/test-utils/testData/api/equals.kt b/kotlin-analysis-api/testData/equals.kt
similarity index 100%
rename from test-utils/testData/api/equals.kt
rename to kotlin-analysis-api/testData/equals.kt
diff --git a/test-utils/testData/api/exitCode.kt b/kotlin-analysis-api/testData/exitCode.kt
similarity index 100%
rename from test-utils/testData/api/exitCode.kt
rename to kotlin-analysis-api/testData/exitCode.kt
diff --git a/test-utils/testData/api/functionKinds.kt b/kotlin-analysis-api/testData/functionKinds.kt
similarity index 100%
rename from test-utils/testData/api/functionKinds.kt
rename to kotlin-analysis-api/testData/functionKinds.kt
diff --git a/test-utils/testData/api/functionTypeAlias.kt b/kotlin-analysis-api/testData/functionTypeAlias.kt
similarity index 100%
rename from test-utils/testData/api/functionTypeAlias.kt
rename to kotlin-analysis-api/testData/functionTypeAlias.kt
diff --git a/test-utils/testData/api/functionTypeAnnotation.kt b/kotlin-analysis-api/testData/functionTypeAnnotation.kt
similarity index 100%
rename from test-utils/testData/api/functionTypeAnnotation.kt
rename to kotlin-analysis-api/testData/functionTypeAnnotation.kt
diff --git a/test-utils/testData/api/functionTypes.kt b/kotlin-analysis-api/testData/functionTypes.kt
similarity index 100%
rename from test-utils/testData/api/functionTypes.kt
rename to kotlin-analysis-api/testData/functionTypes.kt
diff --git a/test-utils/testData/api/getAnnotationByTypeWithInnerDefault.kt b/kotlin-analysis-api/testData/getAnnotationByTypeWithInnerDefault.kt
similarity index 100%
rename from test-utils/testData/api/getAnnotationByTypeWithInnerDefault.kt
rename to kotlin-analysis-api/testData/getAnnotationByTypeWithInnerDefault.kt
diff --git a/test-utils/testData/api/getByName.kt b/kotlin-analysis-api/testData/getByName.kt
similarity index 100%
rename from test-utils/testData/api/getByName.kt
rename to kotlin-analysis-api/testData/getByName.kt
diff --git a/test-utils/testData/api/hello.kt b/kotlin-analysis-api/testData/hello.kt
similarity index 100%
rename from test-utils/testData/api/hello.kt
rename to kotlin-analysis-api/testData/hello.kt
diff --git a/test-utils/testData/api/implicitElements.kt b/kotlin-analysis-api/testData/implicitElements.kt
similarity index 100%
rename from test-utils/testData/api/implicitElements.kt
rename to kotlin-analysis-api/testData/implicitElements.kt
diff --git a/test-utils/testData/api/inheritedTypeAlias.kt b/kotlin-analysis-api/testData/inheritedTypeAlias.kt
similarity index 100%
rename from test-utils/testData/api/inheritedTypeAlias.kt
rename to kotlin-analysis-api/testData/inheritedTypeAlias.kt
diff --git a/test-utils/testData/api/interfaceWithDefault.kt b/kotlin-analysis-api/testData/interfaceWithDefault.kt
similarity index 100%
rename from test-utils/testData/api/interfaceWithDefault.kt
rename to kotlin-analysis-api/testData/interfaceWithDefault.kt
diff --git a/test-utils/testData/api/internalOfFriends.kt b/kotlin-analysis-api/testData/internalOfFriends.kt
similarity index 100%
rename from test-utils/testData/api/internalOfFriends.kt
rename to kotlin-analysis-api/testData/internalOfFriends.kt
diff --git a/test-utils/testData/api/isMutable.kt b/kotlin-analysis-api/testData/isMutable.kt
similarity index 100%
rename from test-utils/testData/api/isMutable.kt
rename to kotlin-analysis-api/testData/isMutable.kt
diff --git a/test-utils/testData/api/javaAnnotatedUtil.kt b/kotlin-analysis-api/testData/javaAnnotatedUtil.kt
similarity index 100%
rename from test-utils/testData/api/javaAnnotatedUtil.kt
rename to kotlin-analysis-api/testData/javaAnnotatedUtil.kt
diff --git a/test-utils/testData/api/javaNonNullTypes.kt b/kotlin-analysis-api/testData/javaNonNullTypes.kt
similarity index 100%
rename from test-utils/testData/api/javaNonNullTypes.kt
rename to kotlin-analysis-api/testData/javaNonNullTypes.kt
diff --git a/test-utils/testData/api/javaSubtype.kt b/kotlin-analysis-api/testData/javaSubtype.kt
similarity index 100%
rename from test-utils/testData/api/javaSubtype.kt
rename to kotlin-analysis-api/testData/javaSubtype.kt
diff --git a/test-utils/testData/api/javaToKotlinMapper.kt b/kotlin-analysis-api/testData/javaToKotlinMapper.kt
similarity index 100%
rename from test-utils/testData/api/javaToKotlinMapper.kt
rename to kotlin-analysis-api/testData/javaToKotlinMapper.kt
diff --git a/test-utils/testData/api/javaTypes.kt b/kotlin-analysis-api/testData/javaTypes.kt
similarity index 100%
rename from test-utils/testData/api/javaTypes.kt
rename to kotlin-analysis-api/testData/javaTypes.kt
diff --git a/test-utils/testData/api/javaTypes2.kt b/kotlin-analysis-api/testData/javaTypes2.kt
similarity index 100%
rename from test-utils/testData/api/javaTypes2.kt
rename to kotlin-analysis-api/testData/javaTypes2.kt
diff --git a/test-utils/testData/api/lateinitProperties.kt b/kotlin-analysis-api/testData/lateinitProperties.kt
similarity index 100%
rename from test-utils/testData/api/lateinitProperties.kt
rename to kotlin-analysis-api/testData/lateinitProperties.kt
diff --git a/test-utils/testData/api/makeNullable.kt b/kotlin-analysis-api/testData/makeNullable.kt
similarity index 100%
rename from test-utils/testData/api/makeNullable.kt
rename to kotlin-analysis-api/testData/makeNullable.kt
diff --git a/test-utils/testData/api/multipleModules.kt b/kotlin-analysis-api/testData/multipleModules.kt
similarity index 100%
rename from test-utils/testData/api/multipleModules.kt
rename to kotlin-analysis-api/testData/multipleModules.kt
diff --git a/test-utils/testData/api/multipleround.kt b/kotlin-analysis-api/testData/multipleround.kt
similarity index 100%
rename from test-utils/testData/api/multipleround.kt
rename to kotlin-analysis-api/testData/multipleround.kt
diff --git a/test-utils/testData/api/nestedAnnotations.kt b/kotlin-analysis-api/testData/nestedAnnotations.kt
similarity index 100%
rename from test-utils/testData/api/nestedAnnotations.kt
rename to kotlin-analysis-api/testData/nestedAnnotations.kt
diff --git a/test-utils/testData/api/nullableTypes.kt b/kotlin-analysis-api/testData/nullableTypes.kt
similarity index 100%
rename from test-utils/testData/api/nullableTypes.kt
rename to kotlin-analysis-api/testData/nullableTypes.kt
diff --git a/test-utils/testData/api/objCacheA.kt b/kotlin-analysis-api/testData/objCacheA.kt
similarity index 100%
rename from test-utils/testData/api/objCacheA.kt
rename to kotlin-analysis-api/testData/objCacheA.kt
diff --git a/test-utils/testData/api/objCacheB.kt b/kotlin-analysis-api/testData/objCacheB.kt
similarity index 100%
rename from test-utils/testData/api/objCacheB.kt
rename to kotlin-analysis-api/testData/objCacheB.kt
diff --git a/test-utils/testData/api/overridee/conflictingOverride.kt b/kotlin-analysis-api/testData/overridee/conflictingOverride.kt
similarity index 100%
rename from test-utils/testData/api/overridee/conflictingOverride.kt
rename to kotlin-analysis-api/testData/overridee/conflictingOverride.kt
diff --git a/test-utils/testData/api/overridee/javaAccessor.kt b/kotlin-analysis-api/testData/overridee/javaAccessor.kt
similarity index 100%
rename from test-utils/testData/api/overridee/javaAccessor.kt
rename to kotlin-analysis-api/testData/overridee/javaAccessor.kt
diff --git a/test-utils/testData/api/overridee/javaOverrideInSource.kt b/kotlin-analysis-api/testData/overridee/javaOverrideInSource.kt
similarity index 100%
rename from test-utils/testData/api/overridee/javaOverrideInSource.kt
rename to kotlin-analysis-api/testData/overridee/javaOverrideInSource.kt
diff --git a/test-utils/testData/api/overridee/noOverride.kt b/kotlin-analysis-api/testData/overridee/noOverride.kt
similarity index 100%
rename from test-utils/testData/api/overridee/noOverride.kt
rename to kotlin-analysis-api/testData/overridee/noOverride.kt
diff --git a/test-utils/testData/api/overridee/overrideInLib.kt b/kotlin-analysis-api/testData/overridee/overrideInLib.kt
similarity index 100%
rename from test-utils/testData/api/overridee/overrideInLib.kt
rename to kotlin-analysis-api/testData/overridee/overrideInLib.kt
diff --git a/test-utils/testData/api/overridee/overrideInSource.kt b/kotlin-analysis-api/testData/overridee/overrideInSource.kt
similarity index 100%
rename from test-utils/testData/api/overridee/overrideInSource.kt
rename to kotlin-analysis-api/testData/overridee/overrideInSource.kt
diff --git a/test-utils/testData/api/overridee/primaryConstructorOverride.kt b/kotlin-analysis-api/testData/overridee/primaryConstructorOverride.kt
similarity index 100%
rename from test-utils/testData/api/overridee/primaryConstructorOverride.kt
rename to kotlin-analysis-api/testData/overridee/primaryConstructorOverride.kt
diff --git a/test-utils/testData/api/packageAnnotations.kt b/kotlin-analysis-api/testData/packageAnnotations.kt
similarity index 100%
rename from test-utils/testData/api/packageAnnotations.kt
rename to kotlin-analysis-api/testData/packageAnnotations.kt
diff --git a/test-utils/testData/api/packageProviderForGenerated.kt b/kotlin-analysis-api/testData/packageProviderForGenerated.kt
similarity index 100%
rename from test-utils/testData/api/packageProviderForGenerated.kt
rename to kotlin-analysis-api/testData/packageProviderForGenerated.kt
diff --git a/test-utils/testData/api/parameterTypes.kt b/kotlin-analysis-api/testData/parameterTypes.kt
similarity index 100%
rename from test-utils/testData/api/parameterTypes.kt
rename to kotlin-analysis-api/testData/parameterTypes.kt
diff --git a/test-utils/testData/api/rawTypes.kt b/kotlin-analysis-api/testData/rawTypes.kt
similarity index 100%
rename from test-utils/testData/api/rawTypes.kt
rename to kotlin-analysis-api/testData/rawTypes.kt
diff --git a/test-utils/testData/api/sealedClass.kt b/kotlin-analysis-api/testData/sealedClass.kt
similarity index 100%
rename from test-utils/testData/api/sealedClass.kt
rename to kotlin-analysis-api/testData/sealedClass.kt
diff --git a/test-utils/testData/api/superTypes.kt b/kotlin-analysis-api/testData/superTypes.kt
similarity index 100%
rename from test-utils/testData/api/superTypes.kt
rename to kotlin-analysis-api/testData/superTypes.kt
diff --git a/test-utils/testData/api/throwList.kt b/kotlin-analysis-api/testData/throwList.kt
similarity index 100%
rename from test-utils/testData/api/throwList.kt
rename to kotlin-analysis-api/testData/throwList.kt
diff --git a/test-utils/testData/api/topLevelMembers.kt b/kotlin-analysis-api/testData/topLevelMembers.kt
similarity index 100%
rename from test-utils/testData/api/topLevelMembers.kt
rename to kotlin-analysis-api/testData/topLevelMembers.kt
diff --git a/test-utils/testData/api/typeAliasComparison.kt b/kotlin-analysis-api/testData/typeAliasComparison.kt
similarity index 100%
rename from test-utils/testData/api/typeAliasComparison.kt
rename to kotlin-analysis-api/testData/typeAliasComparison.kt
diff --git a/test-utils/testData/api/typeComparison2.kt b/kotlin-analysis-api/testData/typeComparison2.kt
similarity index 100%
rename from test-utils/testData/api/typeComparison2.kt
rename to kotlin-analysis-api/testData/typeComparison2.kt
diff --git a/test-utils/testData/api/typeComposure.kt b/kotlin-analysis-api/testData/typeComposure.kt
similarity index 100%
rename from test-utils/testData/api/typeComposure.kt
rename to kotlin-analysis-api/testData/typeComposure.kt
diff --git a/test-utils/testData/api/validateTypes.kt b/kotlin-analysis-api/testData/validateTypes.kt
similarity index 100%
rename from test-utils/testData/api/validateTypes.kt
rename to kotlin-analysis-api/testData/validateTypes.kt
diff --git a/test-utils/testData/api/vararg.kt b/kotlin-analysis-api/testData/vararg.kt
similarity index 100%
rename from test-utils/testData/api/vararg.kt
rename to kotlin-analysis-api/testData/vararg.kt
diff --git a/test-utils/testData/api/varianceTypeCheck.kt b/kotlin-analysis-api/testData/varianceTypeCheck.kt
similarity index 100%
rename from test-utils/testData/api/varianceTypeCheck.kt
rename to kotlin-analysis-api/testData/varianceTypeCheck.kt