Small change in fs
[Context] Some changes & tests