clean up
more robust unit test error reporting