Refactoring
Add filePath to FileResponse
Finish commented out test