Fixed unittests for Filesystem