[Test] Backport fs