cleanup. fixes #25. prep for #16
cleanup test output. improve coverage