fix(mock): avoid double-wrapping null branch for required nullable scalars

fix(mock): avoid double-wrapping null branch for required nullable scalars #954