downloadform revamp - Finishing testsuite (#657)

- Leveraging test suite to 94% of line coverage
- fixing / refactoring some last things

TODO: Still need to test at runtime