Small test tweaks for preds
Refactored according to Yan's designs
Refactored according to Yan's designs