diff --git a/.run/Tests w_ coverage.run.xml b/.run/Tests w_ coverage.run.xml
new file mode 100644
index 00000000..b57460d9
--- /dev/null
+++ b/.run/Tests w_ coverage.run.xml	
@@ -0,0 +1,48 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Tests w/ coverage" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="--rerun-tasks" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":model:compass:test" />
+          <option value=":model:core:test" />
+          <option value=":model:location:test" />
+          <option value=":model:settings:test" />
+          <option value=":model:sun:test" />
+          <option value=":data:compass:testAospRelease" />
+          <option value=":data:compass:testGmsRelease" />
+          <option value=":data:location:testAospRelease" />
+          <option value=":data:location:testGmsRelease" />
+          <option value=":data:settings:testAospRelease" />
+          <option value=":data:settings:testGmsRelease" />
+          <option value=":data:sun:test" />
+          <option value=":ui:compass:testAospRelease" />
+          <option value=":ui:compass:testGmsRelease" />
+          <option value=":ui:core:testAospRelease" />
+          <option value=":ui:core:testGmsRelease" />
+          <option value=":ui:design:testAospRelease" />
+          <option value=":ui:design:testGmsRelease" />
+          <option value=":ui:location:testAospRelease" />
+          <option value=":ui:location:testGmsRelease" />
+          <option value=":ui:settings:testAospRelease" />
+          <option value=":ui:settings:testGmsRelease" />
+          <option value=":ui:sun:testAospRelease" />
+          <option value=":ui:sun:testGmsRelease" />
+          <option value="koverHtmlReport" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Unit tests w_ coverage (test koverHtmlReport).run.xml b/.run/Unit tests w_ coverage (test koverHtmlReport).run.xml
deleted file mode 100644
index 56091029..00000000
--- a/.run/Unit tests w_ coverage (test koverHtmlReport).run.xml	
+++ /dev/null
@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Unit tests w/ coverage (test koverHtmlReport)" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="test" />
-          <option value="koverHtmlReport" />
-          <option value="--rerun" />
-        </list>
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <RunAsTest>false</RunAsTest>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file