diff --git a/tools/lint/tests/interactive/data_operational.test b/tools/lint/tests/interactive/data_operational.test
index 011936a..ce81344 100644
--- a/tools/lint/tests/interactive/data_operational.test
+++ b/tools/lint/tests/interactive/data_operational.test
@@ -32,6 +32,14 @@
     ly_cmd "data -t rpc -O $ddir/modmandatory_invalid.xml $ddir/modrpc.xml"
 }}
 
+test data_operational_empty_datastore {datastore is considered empty because it contains unknown data} {
+-setup $ly_setup -cleanup $ly_cleanup -body {
+    ly_cmd "load modrpc modnotif"
+    ly_cmd "data -t rpc -O $ddir/modmandatory_invalid.xml $ddir/modrpc.xml"
+    set msg "parent \"/modnotif:con\" not found in the operational data"
+    ly_cmd_err "data -t notif -O $ddir/modmandatory_invalid.xml $ddir/modnotif.xml" $msg
+}}
+
 test data_operational_notif_leafref {--operational data is referenced from notification-leafref} {
 -setup $ly_setup -cleanup $ly_cleanup -body {
     ly_cmd "load modoper-leafref"
diff --git a/tools/lint/tests/interactive/data_type.test b/tools/lint/tests/interactive/data_type.test
index 4705ba2..f0538ce 100644
--- a/tools/lint/tests/interactive/data_type.test
+++ b/tools/lint/tests/interactive/data_type.test
@@ -68,22 +68,27 @@
 -setup $ly_setup -cleanup $ly_cleanup -body {
     ly_cmd "load modaction modleaf"
     ly_cmd_err "data -t rpc $ddir/modleaf.xml" "Missing the operation node."
-    ly_cmd "data -t rpc $ddir/modaction.xml"
+    ly_cmd "data -t rpc -O $ddir/modaction_ds.xml $ddir/modaction.xml"
 }}
 
 test data_type_rpc_action_reply {Validation of action-reply by data --type reply} {
 -setup $ly_setup -cleanup $ly_cleanup -body {
     ly_cmd "load modaction modleaf"
     ly_cmd_err "data -t rpc $ddir/modleaf.xml" "Missing the operation node."
-    ly_cmd "data -t reply $ddir/modaction_reply.xml"
+    ly_cmd "data -t reply -O $ddir/modaction_ds.xml $ddir/modaction_reply.xml"
 }}
 
 test data_type_notif {Validation of notification-statement by data --type notif} {
 -setup $ly_setup -cleanup $ly_cleanup -body {
     ly_cmd "load modnotif modleaf"
     ly_cmd_err "data -t notif $ddir/modleaf.xml" "Missing the operation node."
-    ly_cmd "data -t notif $ddir/modnotif.xml"
     ly_cmd "data -t notif $ddir/modnotif2.xml"
 }}
 
+test data_type_notif_nested {Validation of nested-notification-statement by data --type notif} {
+-setup $ly_setup -cleanup $ly_cleanup -body {
+    ly_cmd "load modnotif modleaf"
+    ly_cmd "data -t notif -O $ddir/modnotif_ds.xml $ddir/modnotif.xml"
+}}
+
 cleanupTests