diff --git a/arangod/Aql/AstNode.cpp b/arangod/Aql/AstNode.cpp
index bf46ee3e9f..5ab63f39f6 100644
--- a/arangod/Aql/AstNode.cpp
+++ b/arangod/Aql/AstNode.cpp
@@ -936,9 +936,12 @@ bool AstNode::isTrue () const {
     return getMember(1)->isTrue();
   }
   else if (type == NODE_TYPE_OPERATOR_UNARY_NOT) {
-    return ! getMember(0)->isTrue();
+    if (getMember(0)->isFalse()) {
+      // ! false => true
+      return true;
+    }
   }
-
+  
   return false;
 }
 
@@ -978,7 +981,10 @@ bool AstNode::isFalse () const {
     return getMember(1)->isFalse();
   }
   else if (type == NODE_TYPE_OPERATOR_UNARY_NOT) {
-    return ! getMember(0)->isFalse();
+    if (getMember(0)->isTrue()) {
+      // ! true => false
+      return true;
+    }
   }
 
   return false;
diff --git a/js/apps/system/aardvark/test/specs/router/routerSpec.js b/js/apps/system/aardvark/test/specs/router/routerSpec.js
index 278fed6c4c..44e6d357b2 100644
--- a/js/apps/system/aardvark/test/specs/router/routerSpec.js
+++ b/js/apps/system/aardvark/test/specs/router/routerSpec.js
@@ -504,6 +504,7 @@
           "databaseView",
           "databases-menu",
           {
+            users: sessionDummy,
             collection: databaseDummy
           }
         );
diff --git a/js/apps/system/aardvark/test/specs/views/documentViewSpec.js b/js/apps/system/aardvark/test/specs/views/documentViewSpec.js
index 2cd4b8602f..6d5cc5dbee 100644
--- a/js/apps/system/aardvark/test/specs/views/documentViewSpec.js
+++ b/js/apps/system/aardvark/test/specs/views/documentViewSpec.js
@@ -39,6 +39,10 @@
             expect(view.colid).toEqual(0);
             expect(view.events).toEqual({
                 "click #saveDocumentButton": "saveDocument",
+                "click #deleteDocumentButton" : "deleteDocumentModal",
+                "click #confirmDeleteDocument" : "deleteDocument",
+                "click #document-from" : "navigateToDocument",
+                "click #document-to" : "navigateToDocument",
                 "dblclick #documentEditor tr" : "addProperty"
             });
         });
diff --git a/js/apps/system/aardvark/test/specs/views/userManagementViewSpec.js b/js/apps/system/aardvark/test/specs/views/userManagementViewSpec.js
index 83cc62fd21..b28fecd611 100644
--- a/js/apps/system/aardvark/test/specs/views/userManagementViewSpec.js
+++ b/js/apps/system/aardvark/test/specs/views/userManagementViewSpec.js
@@ -69,7 +69,9 @@
           "click #userManagementSearchSubmit"   : "search",
           "click #callEditUserPassword"         : "editUserPassword",
           "click #submitEditUserPassword"       : "submitEditUserPassword",
-          "click #submitEditCurrentUserProfile" : "submitEditCurrentUserProfile"
+          "click #submitEditCurrentUserProfile" : "submitEditCurrentUserProfile",
+          "click .css-label"                    : "checkBoxes",
+          "change #userSortDesc"                : "sorting"
         };
         expect(myEvents).toEqual(myView.events);
       });