added test Filemanager and refactoring tests