Binary files test

And a bug fix that showed up while testing