Tidy up.
Fix tests for binary-checking.