Clarify log messages
Don't compare things we don't know
Add test