Improved scaffold unit tests to also assert for the expected messages