Refactor HttpFileRequest
Upgrade Junit