Message, when no format upgrade is done
Give out correct message on all upgrade scenarios

This commit fixes a bug, that with one format upgrade the wrong
message was put out.

It also adds tests for the output, so that instead of silencing the
output, it's properly checked. This doesn't hide errors anymore.
Fix typo
Merge branch 'no_upgrade_message'

Pull request #361