Test new wrapper factory. Commenting. AH-140