PDI-11140 - Making wrappers testable