Implement file_system method and add them to tests
Merge conflict