Space cleanup and confirmation of broken tests.

Repairing the original test suite against the original code
(bruce/graphy) yields the same failures at this point.