Improve logging prior to automating tests
Tune the housecleaner timeout