Modify the PartialPredEval and Add testcases