fix message generation
add more suitable test messages
fix message type list
remove old test messages