Clean up some warts

Slightly simplify the test, drop some old leftover and avoid shipping a large file that's already on the DUT.

Test job: https://lava.collabora.co.uk/scheduler/job/2843178

Note: this is on top of !3 (merged)