Tests for messageID
Minor cleanup