Merge "Reformat PolicyEngineAPI test cases"