diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a042e5e..f766b60 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,6 +27,12 @@ android {
         }
     }
 
+    sourceSets {
+        getByName("androidTest") {
+            assets.srcDir("$projectDir/schemas")
+        }
+    }
+
     signingConfigs {
         create("release") {
             val keystorePropertiesFile = rootProject.file("keystore.properties")
diff --git a/app/src/androidTest/java/app/hermes/mobile/feature/chat/ChatViewModelScopeTest.kt b/app/src/androidTest/java/app/hermes/mobile/feature/chat/ChatViewModelScopeTest.kt
index 44c5a86..e986411 100644
--- a/app/src/androidTest/java/app/hermes/mobile/feature/chat/ChatViewModelScopeTest.kt
+++ b/app/src/androidTest/java/app/hermes/mobile/feature/chat/ChatViewModelScopeTest.kt
@@ -29,8 +29,10 @@ class ChatViewModelScopeTest {
         composeTestRule.onNodeWithText("Message Hermes…", ignoreCase = true)
             .performTextInput("Draft prompt before rotation")
             
+        composeTestRule.waitForIdle()
         composeTestRule.activityRule.scenario.recreate()
+        composeTestRule.waitForIdle()
         
-        composeTestRule.onNodeWithText("Draft prompt before rotation").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Draft prompt before rotation", substring = true).assertIsDisplayed()
     }
 }