session UPDATE use current draft YANG modules
diff --git a/tests/test_auth.c b/tests/test_auth.c
index 8635167..8166fe2 100644
--- a/tests/test_auth.c
+++ b/tests/test_auth.c
@@ -260,8 +260,8 @@
     ret = nc_server_config_add_ssh_user_password(ctx, "endpt", "test_pw", "testpw", &tree);
     assert_int_equal(ret, 0);
 
-    ret = lyd_new_path(tree, ctx, "/ietf-netconf-server:netconf-server/listen/endpoint[name='endpt']/ssh/ssh-server-parameters/"
-            "client-authentication/users/user[name='test_none']/none", NULL, 0, NULL);
+    ret = lyd_new_path(tree, ctx, "/ietf-netconf-server:netconf-server/listen/endpoints/endpoint[name='endpt']/ssh/"
+            "ssh-server-parameters/client-authentication/users/user[name='test_none']/none", NULL, 0, NULL);
     assert_int_equal(ret, 0);
 
     /* configure the server based on the data */
diff --git a/tests/test_crl.c b/tests/test_crl.c
index 11c4eb2..bbd19ad 100644
--- a/tests/test_crl.c
+++ b/tests/test_crl.c
@@ -166,8 +166,8 @@
     assert_int_equal(ret, 0);
 
     /* set path to a CRL file */
-    ret = lyd_new_path(tree, ctx, "/ietf-netconf-server:netconf-server/listen/endpoint[name='endpt']/tls/tls-server-parameters/"
-            "client-authentication/libnetconf2-netconf-server:crl-path", TESTS_DIR "/data/crl.pem", 0, NULL);
+    ret = lyd_new_path(tree, ctx, "/ietf-netconf-server:netconf-server/listen/endpoints/endpoint[name='endpt']/tls/"
+            "tls-server-parameters/client-authentication/libnetconf2-netconf-server:crl-path", TESTS_DIR "/data/crl.pem", 0, NULL);
     assert_int_equal(ret, 0);
 
     /* configure the server based on the data */
diff --git a/tests/test_fd_comm.c b/tests/test_fd_comm.c
index cd279e2..48dbce7 100644
--- a/tests/test_fd_comm.c
+++ b/tests/test_fd_comm.c
@@ -92,6 +92,7 @@
 test_new_session(NC_SIDE side)
 {
     struct nc_session *sess;
+    struct timespec ts;
 
     sess = calloc(1, sizeof *sess);
     if (!sess) {
@@ -101,9 +102,13 @@
     sess->side = side;
 
     if (side == NC_SERVER) {
+        pthread_mutex_init(&sess->opts.server.ntf_status_lock, NULL);
         pthread_mutex_init(&sess->opts.server.rpc_lock, NULL);
         pthread_cond_init(&sess->opts.server.rpc_cond, NULL);
         sess->opts.server.rpc_inuse = 0;
+
+        nc_timeouttime_get(&ts, 0);
+        sess->opts.server.last_rpc = ts.tv_sec;
     }
 
     sess->io_lock = malloc(sizeof *sess->io_lock);