...
get tests passing
Not really acmeist.
Redo test suite with latest testml