diff --git a/VERSIONS.gradle b/VERSIONS.gradle
index afb3edef..fc4807ef 100644
--- a/VERSIONS.gradle
+++ b/VERSIONS.gradle
@@ -19,14 +19,13 @@ def RESOURCE_PREFIX = "mauron85_bgloc_"
 ext {
     getApplicationId = { ->
         def applicationId = "com.marianhello.app"
-        if (findProject('..:app') != null) {
+        if (rootProject.hasProperty('applicationId')) {
+             applicationId = rootProject.applicationId
+        } else if (findProject('..:app') != null) {
             applicationId = project('..:app').android.defaultConfig.applicationId
         } else if (findProject(':app') != null) {
             applicationId = project(':app').android.defaultConfig.applicationId
         }
-        if (rootProject.hasProperty('applicationId')) {
-            applicationId = rootProject.applicationId
-        }
         return applicationId
     }
 
diff --git a/src/test/java/com/marianhello/backgroundgeolocation/PostLocationTaskTest.java b/src/test/java/com/marianhello/backgroundgeolocation/PostLocationTaskTest.java
index 5cb161f3..5a5c6add 100644
--- a/src/test/java/com/marianhello/backgroundgeolocation/PostLocationTaskTest.java
+++ b/src/test/java/com/marianhello/backgroundgeolocation/PostLocationTaskTest.java
@@ -10,7 +10,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -116,6 +115,8 @@ public void persistTask() throws ProtocolException, InterruptedException {
 
     @Test
     public void persistTaskShouldRejectAfterShutdown() {
+        exception.expect(RejectedExecutionException.class);
+
         LocationDAO mockDAO = mock(LocationDAO.class);
 
         PostLocationTaskListener mockListener = mock(PostLocationTaskListener.class);