Swapping out usage of FileStore in tests