Unit-testing Binary better.
Fixed a Binary bug and some style issues.