more messages, added some tests