Merge "Rename test classes in apex-pdp/model,core"