Some rewrites

It should work with the standard unittest framework.  I need to figure
out how to actually test unittesting though...