Added messageHolder children and updated unit tests.