reformat code in CRewrite tests