reworking message structures and building test workflow scenarios