simplify the message iteration
simplify the test build/teardown steps