SpyDisk-SpyDir test refactoring