Improving createwrappers coverage