fixing MessageId and adding more tests