Refactored junit tests with addFile