minor cleanup
don't print log messages during tests
merge from upstream