Reduced coverage

Some of the new wrapper code is not yet covered well