Clean up test output
Version 0.4

Housekeeping mainly.