Add basic support to test infrastructure for collecting the diff messages
Add checks to the diff output