update to new binary-data-definer syntax

move around stuff in the test suite to make the compiler happy
 (illegal forward declarations)

test suite passes
Merge pull request #2 from hannesm/new-binary-data-syntax

update to new binary-data-definer syntax