diff --git a/tests/path_completion.cpp b/tests/path_completion.cpp
index be676c9..8ad4b35 100644
--- a/tests/path_completion.cpp
+++ b/tests/path_completion.cpp
@@ -44,6 +44,7 @@
     schema->addContainer("/", "example:system");
     schema->addContainer("/example:system", "example:thing");
     schema->addContainer("/", "example:system-state");
+    schema->addLeaf("/example:anoda", "example:iid", yang::InstanceIdentifier{});
     auto mockDatastore = std::make_shared<MockDatastoreAccess>();
 
     // The parser will use DataQuery for key value completion, but I'm not testing that here, so I don't return anything.
@@ -195,6 +196,42 @@
             expectedCompletions = {"example:system-state/"};
             expectedContextLength = 15;
         }
+
+        SECTION("set example:anoda/iid ")
+        {
+            input = "set example:anoda/iid ";
+            expectedCompletions = {"/"};
+            expectedContextLength = 0;
+        }
+
+        SECTION("set example:anoda/iid /")
+        {
+            input = "set example:anoda/iid /";
+            expectedCompletions = {
+                "example:addresses",
+                "example:ano/",
+                "example:anoda/",
+                "example:bota/",
+                "example:leafInt ",
+                "example:list",
+                "example:ovoce",
+                "example:ovocezelenina",
+                "example:readonly ",
+                "example:system-state/",
+                "example:system/",
+                "example:twoKeyList",
+                "second:amelie/",
+                "second:fire/",
+            };
+            expectedContextLength = 0;
+        }
+
+        SECTION("set example:anoda/iid /example:read")
+        {
+            input = "set example:anoda/iid /example:read";
+            expectedCompletions = {"example:readonly "};
+            expectedContextLength = 12;
+        }
     }
 
     SECTION("get completion")