Updated to fix unittests. FilesystemTest has to be adapted.