diff --git a/.run/Generate Demo Baseline Profile.run.xml b/.run/Generate Demo Baseline Profile.run.xml
deleted file mode 100644
index a4b0de892..000000000
--- a/.run/Generate Demo Baseline Profile.run.xml	
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<component name="ProjectRunConfigurationManager">
-  <!--
-  Baseline Profiles improve code execution speed by around 30% from the first launch by avoiding
-  interpretation and just-in-time (JIT) compilation steps for included code paths.
-  More information at http://d.android.com/baseline-profiles.
-
-  In this run configuration we leverage rerun parameter that always reruns the requested task regardless of cache.
-  We also leverage enable-display parameter to be able to verify the generator works as intended.
-  -->
-  <configuration default="false" name="Generate Demo Baseline Profile" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":benchmark:pixel6Api31atdDemoBenchmarkAndroidTest" />
-          <option value="--rerun" />
-          <option value="--enable-display" />
-        </list>
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
diff --git a/.run/spotlessApply.run.xml b/.run/spotlessApply.run.xml
deleted file mode 100644
index 5c4dac833..000000000
--- a/.run/spotlessApply.run.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="spotlessApply" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="--init-script=gradle/init.gradle.kts" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="spotlessApply" />
-        </list>
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt b/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt
index f757f3c0b..bcc9b8dfe 100644
--- a/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt
+++ b/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt
@@ -55,9 +55,9 @@ class SettingsViewModelTest {
         val collectJob =
             launch(UnconfinedTestDispatcher()) { viewModel.settingsUiState.collect() }
 
-        userDataRepository.setThemeBrand(ANDROID)
-        userDataRepository.setDarkThemeConfig(DARK)
-        userDataRepository.setDynamicColorPreference(false)
+        viewModel.updateThemeBrand(ANDROID)
+        viewModel.updateDarkThemeConfig(DARK)
+        viewModel.updateDynamicColorPreference(false)
 
         assertEquals(
             Success(