adapted TestMessage, all tests green