Ben: logging cleanup and test coverage