data tree FEATURE initial implementation of YANG data support
diff --git a/tests/src/test_context.c b/tests/src/test_context.c
index 756365e..839ec02 100644
--- a/tests/src/test_context.c
+++ b/tests/src/test_context.c
@@ -24,6 +24,7 @@
 #include "../../src/tree_schema_free.c"
 #include "../../src/tree_schema_compile.c"
 #include "../../src/tree_schema.c"
+#include "../../src/plugins_types.c"
 
 #include <stdarg.h>
 #include <stddef.h>
diff --git a/tests/src/test_hash_table.c b/tests/src/test_hash_table.c
index 2f10f0a..ca43aa8 100644
--- a/tests/src/test_hash_table.c
+++ b/tests/src/test_hash_table.c
@@ -26,6 +26,7 @@
 #include "../../src/tree_schema_free.c"
 #include "../../src/tree_schema_compile.c"
 #include "../../src/tree_schema.c"
+#include "../../src/plugins_types.c"
 
 #include <stdarg.h>
 #include <stddef.h>
diff --git a/tests/src/test_parser_yang.c b/tests/src/test_parser_yang.c
index 8dca6c5..c171402 100644
--- a/tests/src/test_parser_yang.c
+++ b/tests/src/test_parser_yang.c
@@ -23,6 +23,7 @@
 #include "../../src/tree_schema_free.c"
 #include "../../src/tree_schema_compile.c"
 #include "../../src/tree_schema.c"
+#include "../../src/plugins_types.c"
 
 #include <stdarg.h>
 #include <stddef.h>
@@ -108,7 +109,7 @@
     char *buf, *p;
     size_t len, size;
     int prefix;
-    struct ly_parser_ctx ctx;
+    struct lys_parser_ctx ctx;
     ctx.ctx = NULL;
     ctx.line = 1;
 
@@ -177,7 +178,7 @@
 {
     (void) state; /* unused */
 
-    struct ly_parser_ctx ctx;
+    struct lys_parser_ctx ctx;
     const char *str, *p;
     char *word, *buf;
     size_t len;
@@ -213,7 +214,7 @@
 {
     (void) state; /* unused */
 
-    struct ly_parser_ctx ctx;
+    struct lys_parser_ctx ctx;
     const char *str;
     char *word, *buf;
     size_t len;
@@ -337,7 +338,7 @@
 {
     (void) state; /* unused */
 
-    struct ly_parser_ctx ctx;
+    struct lys_parser_ctx ctx;
     const char *str, *p;
     enum yang_keyword kw;
     char *word;
@@ -673,7 +674,7 @@
 {
     *state = test_minmax;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     uint16_t flags = 0;
     uint32_t value = 0;
     struct lysp_ext_instance *ext = NULL;
@@ -765,7 +766,7 @@
 }
 
 static struct lysp_module *
-mod_renew(struct ly_parser_ctx *ctx)
+mod_renew(struct lys_parser_ctx *ctx)
 {
     struct lysp_module *mod_p;
     static struct lys_module mod = {0};
@@ -791,7 +792,7 @@
 }
 
 static struct lysp_submodule *
-submod_renew(struct ly_parser_ctx *ctx, struct lysp_submodule *submod)
+submod_renew(struct lys_parser_ctx *ctx, struct lysp_submodule *submod)
 {
     lysp_submodule_free(ctx->ctx, submod);
     submod = calloc(1, sizeof *submod);
@@ -814,7 +815,7 @@
 {
     *state = test_module;
 
-    struct ly_parser_ctx ctx;
+    struct lys_parser_ctx ctx;
     struct lysp_module *mod = NULL;
     struct lysp_submodule *submod = NULL;
     struct lys_module *m;
@@ -1086,7 +1087,7 @@
 {
     *state = test_identity;
 
-    struct ly_parser_ctx ctx;
+    struct lys_parser_ctx ctx;
     struct lysp_ident *ident = NULL;
     const char *str;
 
@@ -1131,7 +1132,7 @@
 {
     (void) state; /* unused */
 
-    struct ly_parser_ctx ctx;
+    struct lys_parser_ctx ctx;
     struct lysp_feature *features = NULL;
     const char *str;
 
@@ -1174,7 +1175,7 @@
 {
     (void) state; /* unused */
 
-    struct ly_parser_ctx ctx;
+    struct lys_parser_ctx ctx;
     struct lysp_deviation *d = NULL;
     const char *str;
 
@@ -1223,7 +1224,7 @@
 {
     (void) state; /* unused */
 
-    struct ly_parser_ctx ctx;
+    struct lys_parser_ctx ctx;
     struct lysp_deviate *d = NULL;
     const char *str;
 
@@ -1308,7 +1309,7 @@
 {
     (void) state; /* unused */
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_node_container *c = NULL;
     const char *str;
 
@@ -1381,7 +1382,7 @@
 {
     *state = test_leaf;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_node_leaf *l = NULL;
     const char *str;
 
@@ -1459,7 +1460,7 @@
 {
     *state = test_leaf;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_node_leaflist *ll = NULL;
     const char *str;
 
@@ -1557,7 +1558,7 @@
 {
     *state = test_list;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_node_list *l = NULL;
     const char *str;
 
@@ -1627,7 +1628,7 @@
 {
     *state = test_choice;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_node_choice *ch = NULL;
     const char *str;
 
@@ -1694,7 +1695,7 @@
 {
     *state = test_case;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_node_case *cs = NULL;
     const char *str;
 
@@ -1748,7 +1749,7 @@
 {
     *state = test_any;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_node_anydata *any = NULL;
     const char *str;
 
@@ -1814,7 +1815,7 @@
 {
     *state = test_grouping;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_grp *grp = NULL;
     const char *str;
 
@@ -1870,7 +1871,7 @@
 {
     *state = test_action;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_action *rpcs = NULL;
     struct lysp_node_container *c = NULL;
     const char *str;
@@ -1947,7 +1948,7 @@
 {
     *state = test_notification;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_notif *notifs = NULL;
     struct lysp_node_container *c = NULL;
     const char *str;
@@ -2007,7 +2008,7 @@
 {
     *state = test_uses;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_node_uses *u = NULL;
     const char *str;
 
@@ -2057,7 +2058,7 @@
 {
     *state = test_augment;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lysp_augment *a = NULL;
     const char *str;
 
diff --git a/tests/src/test_printer_yang.c b/tests/src/test_printer_yang.c
index c4ae63e..88b33bf 100644
--- a/tests/src/test_printer_yang.c
+++ b/tests/src/test_printer_yang.c
@@ -23,9 +23,8 @@
 #include "../../src/tree_schema_free.c"
 #include "../../src/tree_schema_compile.c"
 #include "../../src/tree_schema.c"
+#include "../../src/plugins_types.c"
 #include "../../src/printer_yang.c"
-#include "../../src/printer.c"
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
@@ -34,6 +33,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "../../src/printer.c"
+#include "../../src/printer_schema.c"
 #include "libyang.h"
 
 #define BUFSIZE 1024
diff --git a/tests/src/test_tree_schema.c b/tests/src/test_tree_schema.c
index 7dd29c1..c7f3023 100644
--- a/tests/src/test_tree_schema.c
+++ b/tests/src/test_tree_schema.c
@@ -20,6 +20,7 @@
 #include "../../src/tree_schema_compile.c"
 #include "../../src/tree_schema_free.c"
 #include "../../src/tree_schema_helpers.c"
+#include "../../src/plugins_types.c"
 #include "../../src/hash_table.c"
 #include "../../src/xpath.c"
 #include "../../src/context.c"
diff --git a/tests/src/test_tree_schema_compile.c b/tests/src/test_tree_schema_compile.c
index 0207bb7..8954d0d 100644
--- a/tests/src/test_tree_schema_compile.c
+++ b/tests/src/test_tree_schema_compile.c
@@ -21,6 +21,7 @@
 #include "../../src/tree_schema_free.c"
 #include "../../src/tree_schema_compile.c"
 #include "../../src/tree_schema.c"
+#include "../../src/plugins_types.c"
 #include "../../src/context.c"
 #include "../../src/hash_table.c"
 
@@ -125,7 +126,7 @@
     *state = test_module;
 
     const char *str;
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lys_module mod = {0};
     struct lysc_feature *f;
     struct lysc_iffeature *iff;
@@ -193,7 +194,7 @@
 {
     *state = test_feature;
 
-    struct ly_parser_ctx ctx = {0};
+    struct lys_parser_ctx ctx = {0};
     struct lys_module mod = {0}, *modp;
     const char *str;
     struct lysc_feature *f, *f1;
diff --git a/tests/src/test_tree_schema_helpers.c b/tests/src/test_tree_schema_helpers.c
index c3b3e50..02d571a 100644
--- a/tests/src/test_tree_schema_helpers.c
+++ b/tests/src/test_tree_schema_helpers.c
@@ -20,6 +20,7 @@
 #include "../../src/tree_schema_compile.c"
 #include "../../src/tree_schema_free.c"
 #include "../../src/tree_schema_helpers.c"
+#include "../../src/plugins_types.c"
 #include "../../src/hash_table.c"
 #include "../../src/xpath.c"
 #include "../../src/context.c"
diff --git a/tests/src/test_xml.c b/tests/src/test_xml.c
index c93be56..e153b92 100644
--- a/tests/src/test_xml.c
+++ b/tests/src/test_xml.c
@@ -17,7 +17,6 @@
 #include "../../src/xml.c"
 #include "../../src/common.c"
 #include "../../src/log.c"
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
@@ -26,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "../../src/printer.c"
 #include "libyang.h"
 
 #define BUFSIZE 1024