tosulliv: updates and additions to CCM test cases