Added tests for FileUtils, mockito dependency and general reformatting