Extended tests. WrapperFactory complete. AH-293