add message test
merge from origin