diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryTestConfigurator.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryTestConfigurator.kt
index d87707282a2..0bb2899d82a 100644
--- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryTestConfigurator.kt
+++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryTestConfigurator.kt
@@ -10,12 +10,10 @@ import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiBaseTestServiceRegistrar
 import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiLibraryBaseTestServiceRegistrar
 import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtModuleProjectStructure
-import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtModuleWithFiles
 import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AnalysisApiFirTestServiceRegistrar
 import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.configureOptionalTestCompilerPlugin
 import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryBinaryModuleFactory
 import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtModuleFactory
-import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtSourceModuleFactory
 import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestModuleStructureFactory
 import org.jetbrains.kotlin.analysis.test.framework.services.configuration.AnalysisApiJvmEnvironmentConfigurator
 import org.jetbrains.kotlin.analysis.test.framework.services.libraries.DispatchingTestModuleCompiler
@@ -25,14 +23,12 @@ import org.jetbrains.kotlin.analysis.test.framework.services.libraries.TestModul
 import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.model.DependencyKind
-import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.preprocessors.ExternalAnnotationsSourcePreprocessor
 import org.jetbrains.kotlin.test.services.TestModuleStructure
 import org.jetbrains.kotlin.test.services.TestServices
 import org.jetbrains.kotlin.test.services.configuration.ExternalAnnotationsEnvironmentConfigurator
 
 object StandaloneModeLibraryBinaryTestConfigurator : StandaloneModeConfiguratorBase() {
-
     override fun configureTest(builder: TestConfigurationBuilder, disposable: Disposable) {
         with(builder) {
             configureOptionalTestCompilerPlugin()
@@ -40,7 +36,7 @@ object StandaloneModeLibraryBinaryTestConfigurator : StandaloneModeConfiguratorB
             useConfigurators(::ExternalAnnotationsEnvironmentConfigurator)
             useSourcePreprocessor(::ExternalAnnotationsSourcePreprocessor)
 
-            useAdditionalService<KtModuleFactory> { KtCombinedModuleFactory() }
+            useAdditionalService<KtModuleFactory> { KtLibraryBinaryModuleFactory }
             useAdditionalService<TestModuleCompiler> { DispatchingTestModuleCompiler() }
             useAdditionalService<TestModuleDecompiler> { TestModuleDecompilerJar() }
 
@@ -64,13 +60,3 @@ object StandaloneModeLibraryBinaryTestConfigurator : StandaloneModeConfiguratorB
         return TestModuleStructureFactory.createProjectStructureByTestStructure(moduleStructure, testServices, project)
     }
 }
-
-private class KtCombinedModuleFactory : KtModuleFactory {
-    override fun createModule(testModule: TestModule, testServices: TestServices, project: Project): KtModuleWithFiles {
-        return if (testModule.name == "app") {
-            KtSourceModuleFactory.createModule(testModule, testServices, project)
-        } else {
-            KtLibraryBinaryModuleFactory.createModule(testModule, testServices, project)
-        }
-    }
-}
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt
index 298764c16bc..3ec97424a2a 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt
@@ -18,6 +18,7 @@ package my.collections
 fun <K, V> myMapOf(vararg pairs: Pair<K, V>): Map<K, V> = mapOf(*pairs)
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 import my.collections.*
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt
index 8c4717c35f1..6fee1230b97 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt
@@ -17,6 +17,7 @@ class Dependency {
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt
index c75d42c7ffe..92b9a865d55 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt
@@ -17,6 +17,7 @@ class Dependency {
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt
index 216ac57b483..4f255692a29 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt
@@ -17,6 +17,7 @@ class Dependency {
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInInnerClass.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInInnerClass.kt
index 69dca864355..6fff184159a 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInInnerClass.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInInnerClass.kt
@@ -16,6 +16,7 @@ class Outer {
 }
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt
index ef5a91abce6..998efdd7978 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt
@@ -17,6 +17,7 @@ class Dependency {
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt
index 15b9bc0af1d..570eda8209c 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt
@@ -17,6 +17,7 @@ class Dependency {
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt
index 5eed227291c..be3660c6738 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt
@@ -17,6 +17,7 @@ class Dependency {
 val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNestedObject.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNestedObject.kt
index 35d182693f5..0e8597d95aa 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNestedObject.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNestedObject.kt
@@ -16,6 +16,7 @@ class Outer {
 }
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt
index ef53cf36bd5..ffca9bc48ae 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt
@@ -11,6 +11,7 @@ object DependencyObject {
 }
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 package some
diff --git a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInOuterClass.kt b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInOuterClass.kt
index 5ac9711769d..eaa8042f04b 100644
--- a/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInOuterClass.kt
+++ b/analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInOuterClass.kt
@@ -16,6 +16,7 @@ class Outer {
 }
 
 // MODULE: app(lib)
+// MODULE_KIND: Source
 // FILE: main.kt
 
 package some