Merge "Fix test following -p removal."