refactored SpyDisk/SpyDir
test SpyDisk/SpyDir teardown's now called