clean-up, add delay between messages, improve messages in tests