More cleanup of logs in tests that should not be called.