test for log message setup too
fix cleanup