diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index d546c3eb..5bc79c34 100644
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -44,6 +44,12 @@ android {
     namespace = "org.isoron.uhabits"
     compileSdk = 36
 
+    sourceSets {
+        getByName("main") {
+            assets.srcDirs("src/main/assets", "../uhabits-core/assets/main")
+        }
+    }
+
     defaultConfig {
         versionCode = 20301
         versionName = "2.3.1"
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.kt
index 53678110..a83ea6bc 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.kt
@@ -30,7 +30,6 @@ import junit.framework.TestCase
 import org.hamcrest.CoreMatchers.hasItems
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.platform.time.LocalDate
-import org.isoron.platform.time.computeToday
 import org.isoron.platform.time.getToday
 import org.isoron.platform.time.setToday
 import org.isoron.uhabits.core.models.HabitList
@@ -85,7 +84,7 @@ abstract class BaseAndroidTest : TestCase() {
         prefs = appComponent.preferences
         habitList = appComponent.habitList
         taskRunner = appComponent.taskRunner
-        setToday(computeToday(appComponent.preferences.midnightDelayHours, 0))
+        setToday(LocalDate(2015, 1, 25))
         modelFactory = appComponent.modelFactory
         prefs.clear()
         fixtures = HabitFixtures(modelFactory, habitList)
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt
index 40b80f9d..00b6198c 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt
@@ -48,7 +48,7 @@ class FrequencyCardViewTest : BaseViewTest() {
         view.setState(
             FrequencyCardPresenter.buildState(
                 habit = habit,
-                firstWeekday = DayOfWeek.SUNDAY,
+                firstWeekday = DayOfWeek.SATURDAY,
                 theme = LightTheme()
             )
         )