Added condition for when to work self, previous tests fail of course
Refactored methods out of AbstractFileMaster to FileUtils