add test / fixed additional message bug