Improves Fs provider for UT