added file system test and fixed implementations