Fix proto naming, add merkle message test.