cleanup, more message tests
Minor refactor (helps with auto-complete in tests)