diff --git a/src/test/resources/test-data.sql b/src/test/resources/test-data.sql
index 03124d36099e28148378aaa913b0251cf73d69d5..e0b731a4dc18fe29a490f27e8e8b563a239d7343 100644
--- a/src/test/resources/test-data.sql
+++ b/src/test/resources/test-data.sql
@@ -12,36 +12,36 @@ INSERT INTO location (location_type, storage_src_id, storage_dest_id) VALUES ('u
 DELETE FROM node;
 ALTER SEQUENCE node_node_id_seq RESTART WITH 1;
 
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, location_id, is_public) VALUES (NULL, NULL, '', 'container', '0', 1, true);
+INSERT INTO node (parent_path, name, type, creator_id, location_id, is_public) VALUES (NULL, '', 'container', '0', 1, true);
 
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, group_read, group_write, location_id) VALUES ('', NULL, 'test1', 'container', 'user1', '{"group1","group2"}','{"group2"}', 1);      -- /test1
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, location_id) VALUES ('2', '', 'f1', 'container', 'user1', 1);      -- /test1/f1 (rel: /f1)
-INSERT INTO node (parent_path, parent_relative_path, name, os_name, type, creator_id, location_id, quota) VALUES ('2.3', '3', 'f2_renamed', 'f2', 'container', 'user1', 1, 50000);      -- /test1/f1/f2_renamed (rel: /f1/f2)
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, location_id, content_md5, content_length) VALUES ('2.3.4', '3.4', 'f3', 'data', 'user1', 1, '<md5sum>', 4000);      -- /test1/f1/f2_renamed/f3 (rel: /f1/f2/f3)
+INSERT INTO node (parent_path, name, type, creator_id, group_read, group_write, location_id) VALUES ('', 'test1', 'container', 'user1', '{"group1","group2"}','{"group2"}', 1);      -- /test1
+INSERT INTO node (parent_path, name, type, creator_id, location_id) VALUES ('2', 'f1', 'container', 'user1', 1);      -- /test1/f1 (rel: /f1)
+INSERT INTO node (parent_path, name, os_name, type, creator_id, location_id, quota) VALUES ('2.3', 'f2_renamed', 'f2', 'container', 'user1', 1, 50000);      -- /test1/f1/f2_renamed (rel: /f1/f2)
+INSERT INTO node (parent_path, name, type, creator_id, location_id, content_md5, content_length) VALUES ('2.3.4', 'f3', 'data', 'user1', 1, '<md5sum>', 4000);      -- /test1/f1/f2_renamed/f3 (rel: /f1/f2/f3)
 
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, is_public, location_id) VALUES ('', NULL, 'test2', 'container', 'user2', true, 1);      -- /test2
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, is_public, location_id) VALUES ('6', '', 'f4', 'container', 'user2', true, 1);    -- /test2/f4 (rel: /f4)
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, is_public, location_id) VALUES ('6', '', 'f5', 'container', 'user2', true, 1);    -- /test2/f5 (rel: /f5)
+INSERT INTO node (parent_path, name, type, creator_id, is_public, location_id) VALUES ('', 'test2', 'container', 'user2', true, 1);      -- /test2
+INSERT INTO node (parent_path, name, type, creator_id, is_public, location_id) VALUES ('6', 'f4', 'container', 'user2', true, 1);    -- /test2/f4 (rel: /f4)
+INSERT INTO node (parent_path, name, type, creator_id, is_public, location_id) VALUES ('6', 'f5', 'container', 'user2', true, 1);    -- /test2/f5 (rel: /f5)
 
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, is_public, location_id) VALUES ('', NULL, 'test3', 'container', 'user3', false, 3);      -- /test3
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, is_public, location_id) VALUES ('9', '', 'm1', 'container', 'user3', false, 3);      -- /test3/m1
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, is_public, location_id) VALUES ('9.10', '', 'm2', 'container', 'user3', false, 3);      -- /test3/m1/m2
+INSERT INTO node (parent_path, name, type, creator_id, is_public, location_id) VALUES ('', 'test3', 'container', 'user3', false, 3);      -- /test3
+INSERT INTO node (parent_path, name, type, creator_id, is_public, location_id) VALUES ('9', 'm1', 'container', 'user3', false, 3);      -- /test3/m1
+INSERT INTO node (parent_path, name, type, creator_id, is_public, location_id) VALUES ('9.10', 'm2', 'container', 'user3', false, 3);      -- /test3/m1/m2
 
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, is_public, location_id) VALUES ('', NULL, 'test4', 'container', 'user3', false, 3);      -- /test4
+INSERT INTO node (parent_path, name, type, creator_id, is_public, location_id) VALUES ('', 'test4', 'container', 'user3', false, 3);      -- /test4
 
-INSERT INTO node (parent_path, parent_relative_path, name, sticky, type, creator_id, is_public, location_id) VALUES ('9', '', 'mstick', true, 'container', 'user3', false, 3);      -- /test3/mstick
-INSERT INTO node (parent_path, parent_relative_path, name, job_id, type, creator_id, is_public, location_id) VALUES ('9', '', 'mbusy', 'job1234', 'container', 'user3', false, 3);      -- /test3/mbusy
-INSERT INTO node (parent_path, parent_relative_path, name, async_trans, type, creator_id, is_public, location_id) VALUES ('9', '', 'masynctrans', true, 'container', 'user3', false, 3);      -- /test3/masynctrans
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, is_public, location_id) VALUES ('9', '', 'asyncloc', 'container', 'user3', false, 1);      -- /test3/asyncloc
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, group_write, group_read, is_public, location_id) VALUES ('9', '', 'group1', 'container', 'user3', '{"group1"}', '{"group1"}', false, 3);      -- /test3/group1
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, group_write, group_read, is_public, location_id, target) VALUES ('9.10', '', 'link1', 'link', 'user3', '{"group1"}', '{"group1"}', false, 3, 'vos://authority/dummy/link');      -- /test3/m1/link1
+INSERT INTO node (parent_path, name, sticky, type, creator_id, is_public, location_id) VALUES ('9', 'mstick', true, 'container', 'user3', false, 3);      -- /test3/mstick
+INSERT INTO node (parent_path, name, job_id, type, creator_id, is_public, location_id) VALUES ('9', 'mbusy', 'job1234', 'container', 'user3', false, 3);      -- /test3/mbusy
+INSERT INTO node (parent_path, name, async_trans, type, creator_id, is_public, location_id) VALUES ('9', 'masynctrans', true, 'container', 'user3', false, 3);      -- /test3/masynctrans
+INSERT INTO node (parent_path, name, type, creator_id, is_public, location_id) VALUES ('9', 'asyncloc', 'container', 'user3', false, 1);      -- /test3/asyncloc
+INSERT INTO node (parent_path, name, type, creator_id, group_write, group_read, is_public, location_id) VALUES ('9', 'group1', 'container', 'user3', '{"group1"}', '{"group1"}', false, 3);      -- /test3/group1
+INSERT INTO node (parent_path, name, type, creator_id, group_write, group_read, is_public, location_id, target) VALUES ('9.10', 'link1', 'link', 'user3', '{"group1"}', '{"group1"}', false, 3, 'vos://authority/dummy/link');      -- /test3/m1/link1
 
-INSERT INTO node (parent_path, parent_relative_path, name, sticky, type, creator_id, group_write, group_read, is_public, location_id) VALUES ('', NULL, 'mycontainer', true, 'container', 'user3', '{"group1"}', '{"group1"}', false, 3);      -- /mycontainer
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, group_write, group_read, is_public, location_id) VALUES ('19', '', 'container1', 'container', 'user3', '{"group1"}', '{"group1"}', false, 3);      -- /mycontainer/container1
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, group_write, group_read, is_public, location_id) VALUES ('19', '', 'destination2', 'container', 'user3', '{"group1"}', '{"group1"}', false, 3);      -- /mycontainer/destination2
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, group_write, group_read, is_public, location_id) VALUES ('19.21', '20', 'control', 'container', 'user3', '{"group1"}', '{"group1"}', false, 3);      -- /mycontainer/destination2/control
+INSERT INTO node (parent_path, name, sticky, type, creator_id, group_write, group_read, is_public, location_id) VALUES ('', 'mycontainer', true, 'container', 'user3', '{"group1"}', '{"group1"}', false, 3);      -- /mycontainer
+INSERT INTO node (parent_path, name, type, creator_id, group_write, group_read, is_public, location_id) VALUES ('19', 'container1', 'container', 'user3', '{"group1"}', '{"group1"}', false, 3);      -- /mycontainer/container1
+INSERT INTO node (parent_path, name, type, creator_id, group_write, group_read, is_public, location_id) VALUES ('19', 'destination2', 'container', 'user3', '{"group1"}', '{"group1"}', false, 3);      -- /mycontainer/destination2
+INSERT INTO node (parent_path, name, type, creator_id, group_write, group_read, is_public, location_id) VALUES ('19.21', 'control', 'container', 'user3', '{"group1"}', '{"group1"}', false, 3);      -- /mycontainer/destination2/control
 
-INSERT INTO node (parent_path, parent_relative_path, name, type, creator_id, group_write, group_read, is_public, location_id, target) VALUES ('9.10', '', 'link2', 'link', 'user3', '{"group1"}', '{"group1"}', false, 3, 'vos://example.com!vospace/test1/f1/f2_renamed/f3');      -- /test3/m1/link2
+INSERT INTO node (parent_path, name, type, creator_id, group_write, group_read, is_public, location_id, target) VALUES ('9.10', 'link2', 'link', 'user3', '{"group1"}', '{"group1"}', false, 3, 'vos://example.com!vospace/test1/f1/f2_renamed/f3');      -- /test3/m1/link2
 
 DELETE FROM job;