Using proper method of pushing file download
Returning proper file path
Updating test to reflect latest changes