[tests] Final clean-ups in the CPML test framework