Merge "Add Tests for Message & Claim APIs"