Refactor fs tests to be better about temp files and cleanup.
Refactor fs tests to be better about temp files and cleanup.

dherges/nodyn,dherges/nodyn,tony--/nodyn,nodyn/nodyn,dherges/nodyn,tony--/nodyn,tony--/nodyn,nodyn/nodyn,nodyn/nodyn