Adding structure for two block and multiple block message tests.