Allow overriding the base filename but still having the correct extension added.

Reinstate test for download disposition header and filename.