diff --git a/src/fspp/fstest/FsppDirTest.h b/src/fspp/fstest/FsppDirTest.h
index 5c38c377..29818d4d 100644
--- a/src/fspp/fstest/FsppDirTest.h
+++ b/src/fspp/fstest/FsppDirTest.h
@@ -273,13 +273,8 @@ REGISTER_TYPED_TEST_CASE_P(FsppDirTest,
   CreateDir_AlreadyExisting
 );
 
-//TODO stat
-//TODO access
-//TODO rename
-//TODO utimens
+
 //TODO rmdir (also test that deleting a non-empty dir returns ENOTEMPTY, because otherwise there might not be any unlink syscalls for the entries issued)
-//TODO chmod
-//TODO chown
 //TODO mkdir with uid/gid
 //TODO createAndOpenFile: all stat values correctly set (1. in the OpenFile instance returned from createAndOpenFile and 2. on an lstat on the file object afterwards)
 //TODO Test all operations do (or don't) affect dir timestamps correctly
diff --git a/src/fspp/fstest/FsppFileTest.h b/src/fspp/fstest/FsppFileTest.h
index f7f6f870..7417cd49 100644
--- a/src/fspp/fstest/FsppFileTest.h
+++ b/src/fspp/fstest/FsppFileTest.h
@@ -269,9 +269,7 @@ REGISTER_TYPED_TEST_CASE_P(FsppFileTest,
 );
 
 //TODO access
-//TODO rename
 //TODO unlink
 //TODO Test all operations do (or don't) affect file timestamps correctly (including rename, which shouldn't modify access/modify time, but inode change time)
-//TODO (here and in other fstest operations): Test error paths
 
 #endif
diff --git a/src/fspp/fstest/FsppNodeTest.h b/src/fspp/fstest/FsppNodeTest.h
index c6759aa3..760d28b1 100644
--- a/src/fspp/fstest/FsppNodeTest.h
+++ b/src/fspp/fstest/FsppNodeTest.h
@@ -241,3 +241,16 @@ REGISTER_NODE_TEST_CASES(
 );
 
 #endif
+
+//TODO Test for rename (success AND error cases) that stat values stay unchanged (i.e. mode, uid, gid, access times, ...)
+//TODO Test for rename (success AND error cases) that contents stay unchanged (i.e. file contents, directory children, symlink target)
+//TODO (here and in other fstest operations): Test error paths
+
+//TODO Move other applicable test cases from FsppFileTest to here (e.g. utimens, chmod, ...)
+//TODO stat
+//TODO access
+//TODO utimens
+//TODO chmod
+//TODO chown
+
+//TODO Test all operations do (or don't) affect dir timestamps correctly
\ No newline at end of file
diff --git a/src/fspp/fstest/FsppSymlinkTest.h b/src/fspp/fstest/FsppSymlinkTest.h
index 30c49712..7760658d 100644
--- a/src/fspp/fstest/FsppSymlinkTest.h
+++ b/src/fspp/fstest/FsppSymlinkTest.h
@@ -51,5 +51,6 @@ REGISTER_TYPED_TEST_CASE_P(FsppSymlinkTest,
 );
 
 //TODO Other tests?
+//TODO Test all operations do (or don't) affect dir timestamps correctly
 
 #endif