Fix UT in node 0.6
Merge branch 'convert_cs' into multiple_ps