Removed FakeFS dependency
Fixed multiple issues