Fix spec failures introduced by the previous commit

Non-deploy messages should be printed only when deployment did
not happen. Basically, revert the specs for the non-deploy messages
and add a new spec that explicitly checks for the non-deploy
messages when the deploy condition fails.