HV-692 Simplifying MessageInterpolatorContextTest
HV-692 Implementing new unwrap() methods