[D22][Testing] (CP, RP) Reformated files