Updated tests to use mock file system in most cases - 4 failing still