Refactored tests structure
Added File model