fix cleanup after test run; add MessagePayload protocol and second test
both tests are the same