fix test_from_pr using #1238, fix remark