Reorganising cot_soc and tests