Diff reduce with upstream
Update pjdfstest