fs: clean up a few tests#4

tspader merged 2 commits into

maintspader/sp:mainfrom

fs/test-cleanuptspader/sp:fs/test-cleanupCopy head branch name to clipboard