add tests for full exchange messaging, and related fixes