Fix log message
Adapt tests to behaviour introduced in #13333