Fix UT
Merge branch 'convert_cs' into multiple_ps