Embellished the errors that can be reported to MHV,

with unit test updates for this.

Change-Id: I4f7a0a933953549bdec85d924bd986af09608374