Internal refactoring + Increase test coverage
remove unused requirements
fields.file: replace the  method for the common  method. The actual file uplaoding must be done using that