diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeederTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeederTest.java
index d7f993b18ad7af7f451dde95936825799436d003..59cb548d617d88e890c9c1e13b1b6a82b6c0623a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeederTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeederTest.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.lang.reflect.Method;
 import java.util.Date;
 
+import org.hamcrest.core.IsNull;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.testng.annotations.AfterMethod;
@@ -79,23 +80,29 @@ public class DatabaseBasedDataSetPathsInfoFeederTest extends AbstractFileSystemT
                 {
                     one(dao).createDataSet("ds-1", "a/b/c/");
                     will(returnValue(42L));
-                    
-                    one(dao).createDataSetFile(42L, null, "", ROOT_PATH, 38, true, new Date(1));
+
+                    one(dao).createDataSetFile(with(42L), with(new IsNull<Long>()), with(""),
+                            with(ROOT_PATH), with(38L), with(true), with(any(Date.class)));
                     will(returnValue(100L));
-                    
-                    one(dao).createDataSetFile(42L, 100L, "dir", "dir", 26, true, new Date(2));
+
+                    one(dao).createDataSetFile(with(42L), with(100L), with("dir"), with("dir"),
+                            with(26L), with(true), with(any(Date.class)));
                     will(returnValue(101L));
-                    
-                    one(dao).createDataSetFile(42L, 101L, "dir/hello.txt", "hello.txt", 11, false, new Date(3));
+
+                    one(dao).createDataSetFile(with(42L), with(101L), with("dir/hello.txt"),
+                            with("hello.txt"), with(11L), with(false), with(any(Date.class)));
                     will(returnValue(102L));
-                    
-                    one(dao).createDataSetFile(42L, 101L, "dir/read.me", "read.me", 15, false, new Date(4));
+
+                    one(dao).createDataSetFile(with(42L), with(101L), with("dir/read.me"),
+                            with("read.me"), with(15L), with(false), with(any(Date.class)));
                     will(returnValue(103L));
-                    
-                    one(dao).createDataSetFile(42L, 101L, "dir/dir", "dir", 0, true, new Date(5));
+
+                    one(dao).createDataSetFile(with(42L), with(101L), with("dir/dir"), with("dir"),
+                            with(0L), with(true), with(any(Date.class)));
                     will(returnValue(104L));
-                    
-                    one(dao).createDataSetFile(42L, 100L, "read.me", "read.me", 12, false, new Date(6));
+
+                    one(dao).createDataSetFile(with(42L), with(100L), with("read.me"),
+                            with("read.me"), with(12L), with(false), with(any(Date.class)));
                     will(returnValue(105L));
                 }
             });
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
index c4ead1dae4ade69030af5e7985edfac59d285512..5e4b1102194d1bf04daa8e3133cf3ec0ca2b74c2 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
@@ -240,6 +240,9 @@ public class PathInfoDatabaseFeedingTaskTest extends AbstractFileSystemTestCase
                     one(node).isDirectory();
                     will(returnValue(false));
 
+                    one(node).getLastModified();
+                    will(returnValue(42L));
+                    
                     one(dao).createDataSetFile(101L, null, "", "ds1-root", 12345L, false, new Date(42));
                     will(returnValue(102L));