Add code to test message exchange