diff --git a/MagicalRecord/Core/MagicalRecord+Actions.m b/MagicalRecord/Core/MagicalRecord+Actions.m
index 16165d28e..c55e06df3 100644
--- a/MagicalRecord/Core/MagicalRecord+Actions.m
+++ b/MagicalRecord/Core/MagicalRecord+Actions.m
@@ -13,10 +13,10 @@
 dispatch_queue_t action_queue(void);
 dispatch_queue_t action_queue(void)
 {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
+    if (background_action_queue == NULL)
+    {
         background_action_queue = dispatch_queue_create("com.magicalpanda.magicalrecord.actionQueue", DISPATCH_QUEUE_SERIAL);
-    });
+    }
 
     return background_action_queue;
 }
diff --git a/Project Files/Magical Record.xcodeproj/xcshareddata/xcschemes/iOS App Unit Tests.xcscheme b/Project Files/Magical Record.xcodeproj/xcshareddata/xcschemes/iOS App Unit Tests.xcscheme
index 4262e4e14..893750f70 100644
--- a/Project Files/Magical Record.xcodeproj/xcshareddata/xcschemes/iOS App Unit Tests.xcscheme	
+++ b/Project Files/Magical Record.xcodeproj/xcshareddata/xcschemes/iOS App Unit Tests.xcscheme	
@@ -46,7 +46,7 @@
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Debug"
@@ -63,6 +63,11 @@
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
+         <AdditionalOption
+            key = "NSZombieEnabled"
+            value = "YES"
+            isEnabled = "YES">
+         </AdditionalOption>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction