Change file_store_tests and adjust file_system that the tests pass
Merge branch 'master' of https://github.com/Marktown/frontend