Use a separate variable for logs in tests.
Merge commit '360ded3c07d7577f85db8e976a34a8825fa467ef'