DRY up a bit more...
Add an actual binary file to see test failures ensue.
Tidy up.