Rewrote unit testing of wrapper factory to work with new design. AH-126