Index: oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/NodeExistsCommandMongo.java
===================================================================
--- oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/NodeExistsCommandMongo.java	(revision 1388461)
+++ oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/NodeExistsCommandMongo.java	(working copy)
@@ -16,13 +16,11 @@
  */
 package org.apache.jackrabbit.mongomk.command;
 
-import java.util.List;
+import java.util.Set;
 
 import org.apache.jackrabbit.mongomk.MongoConnection;
 import org.apache.jackrabbit.mongomk.api.command.AbstractCommand;
-import org.apache.jackrabbit.mongomk.model.NodeMongo;
-import org.apache.jackrabbit.mongomk.query.FetchNodeByPathQuery;
-import org.apache.jackrabbit.mongomk.util.MongoUtil;
+import org.apache.jackrabbit.mongomk.api.model.Node;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 
 /**
@@ -31,10 +29,12 @@
  * @author <a href="mailto:pmarx@adobe.com>Philipp Marx</a>
  */
 public class NodeExistsCommandMongo extends AbstractCommand<Boolean> {
+
     private final MongoConnection mongoConnection;
-    private NodeMongo parentNode;
-    private final String path;
-    private String revisionId;
+    private final String revisionId;
+
+    private Node parentNode;
+    private String path;
 
     /**
      * Constructs a new {@code NodeExistsCommandMongo}.
@@ -54,21 +54,25 @@
         if (PathUtils.denotesRoot(path)) {
             return true;
         }
-        ensureRevisionId();
-        readParentNode();
-        return childExists();
-    }
 
-    private void ensureRevisionId() throws Exception {
-        if (revisionId == null) {
-            revisionId = new GetHeadRevisionCommandMongo(mongoConnection).execute();
+        // Check that all the paths up to the parent are valid.
+        while (!PathUtils.denotesRoot(path)) {
+            readParentNode();
+            if (!childExists()) {
+                return false;
+            }
+            path = PathUtils.getParentPath(path);
         }
+
+        return true;
     }
 
     private void readParentNode() throws Exception {
         String parentPath = PathUtils.getParentPath(path);
-        FetchNodeByPathQuery query = new FetchNodeByPathQuery(mongoConnection, parentPath, MongoUtil.toMongoRepresentation(revisionId));
-        parentNode = query.execute();
+        // TODO - This used to be FetchNodeByPathQuery but changed to GetNodesCommandMongo to make
+        // sure nodes are in a valid commit etc. Check if GetNodesCommandMongo is really needed.
+        GetNodesCommandMongo command = new GetNodesCommandMongo(mongoConnection, parentPath, revisionId, -1);
+        parentNode = command.execute();
     }
 
     private boolean childExists() {
@@ -76,13 +80,13 @@
             return false;
         }
 
-        List<String> children = parentNode.getChildren();
+        Set<Node> children = parentNode.getChildren();
         if (children == null || children.isEmpty()) {
             return false;
         }
 
-        for (String child : children) {
-            if (child.equals(PathUtils.getName(path))) {
+        for (Node child : children) {
+            if (child.getName().equals(PathUtils.getName(path))) {
                 return true;
             }
         }
Index: oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/NodeExistsCommandMongoTest.java
===================================================================
--- oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/NodeExistsCommandMongoTest.java	(revision 1388461)
+++ oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/NodeExistsCommandMongoTest.java	(working copy)
@@ -119,7 +119,7 @@
         instructions.add(new AddNodeInstructionImpl("/a/b", "c"));
         instructions.add(new AddNodeInstructionImpl("/a/b/c", "d"));
 
-        Commit commit = new CommitImpl("Add nodes", "/", "TODO", instructions);
+        Commit commit = new CommitImpl("/", "TODO", "Add nodes", instructions);
         CommitCommandMongo command = new CommitCommandMongo(mongoConnection,
                 commit);
         command.execute();
@@ -127,7 +127,7 @@
         // Remove b.
         instructions = new LinkedList<Instruction>();
         instructions.add(new RemoveNodeInstructionImpl("/a", "b"));
-        commit = new CommitImpl("Delete /b", "/a", "-b", instructions);
+        commit = new CommitImpl("/a", "-b", "Delete /b", instructions);
         command = new CommitCommandMongo(mongoConnection, commit);
         command.execute();
 
@@ -139,6 +139,34 @@
     }
 
     @Test
+    public void existsInHeadRevision() throws Exception {
+
+        List<Instruction> instructions = new LinkedList<Instruction>();
+
+        // Add /a
+        instructions.add(new AddNodeInstructionImpl("/", "a"));
+        Commit commit1 = new CommitImpl("/", "+a : {}", "Add node a",
+                instructions);
+        CommitCommandMongo command = new CommitCommandMongo(mongoConnection,
+                commit1);
+        command.execute();
+
+        // Add /a/b
+        instructions = new LinkedList<Instruction>();
+        instructions.add(new AddNodeInstructionImpl("/a", "b"));
+        Commit commit2 = new CommitImpl("/a", "+b : {}", "Add node a/b",
+                instructions);
+        command = new CommitCommandMongo(mongoConnection, commit2);
+        command.execute();
+
+        // Verify /a is visible in the head revision
+        NodeExistsCommandMongo command2 = new NodeExistsCommandMongo(
+                mongoConnection, "/a", null);
+        boolean exists = command2.execute();
+        assertTrue("The node a is not found in the head revision!", exists);
+    }
+
+    @Test
     public void existsInOldRevNotInNewRev() throws Exception {
         SimpleNodeScenario scenario = new SimpleNodeScenario(mongoConnection);
         String rev1 = scenario.create();
@@ -172,47 +200,7 @@
 
     @Test
     @Ignore
-    public void testNodeNotFound() throws Exception {
-
-        // adds nodes /a,/a/b,/a/b/c , checks if node a exists
-        List<Instruction> instructions = new LinkedList<Instruction>();
-
-        // commit node /a
-        instructions.add(new AddNodeInstructionImpl("/", "a"));
-        Commit commit1 = new CommitImpl("/", "+a : {}", "Add node a",
-                instructions);
-        CommitCommandMongo command = new CommitCommandMongo(mongoConnection,
-                commit1);
-        command.execute();
-
-        // commit node /a/b
-        instructions = new LinkedList<Instruction>();
-        instructions.add(new AddNodeInstructionImpl("/a", "b"));
-        Commit commit2 = new CommitImpl("/a", "+b : {}", "Add node a/b",
-                instructions);
-        command = new CommitCommandMongo(mongoConnection, commit2);
-        command.execute();
-
-        // commit node /a/b/c
-        instructions = new LinkedList<Instruction>();
-        instructions.add(new AddNodeInstructionImpl("/a/b", "c"));
-        Commit commit3 = new CommitImpl("a/b", "+c : {}", "Add node a/b/c",
-                instructions);
-        command = new CommitCommandMongo(mongoConnection, commit3);
-        command.execute();
-
-        // verify if node a is visible in the head revision
-        NodeExistsCommandMongo isNodeVisible = new NodeExistsCommandMongo(
-                mongoConnection, "/a", null);
-        boolean exists = isNodeVisible.execute();
-        assertTrue("The node a is not found in the head revision!", exists);
-
-    }
-
-    @Test
-    @Ignore
     public void testTreeDepth() throws Exception {
-
         String path = "/";
         List<Instruction> instructions = new LinkedList<Instruction>();
 
@@ -226,7 +214,6 @@
             command.execute();
             path = (path.endsWith("/")) ? (path = path + "N" + i)
                     : (path = path + "/N" + i);
-            //System.out.println("*********" + path.length() + "*****");
         }
 
     }