Renaming File properties to be more natural in usage
Removing unstable test