Revise test_download.py (rebased onto develop)



This is the same as gh-2569 but rebased onto develop.

----

This PR brings the usage of `pytest` into line with that used throughout our Python tests.

The relevant tests should still pass.