Wire up top level binary and fix some tests

 	886c6a4