Remove some test code
Fix a issue in the filesystem storage