fix tests broken by changes to c.l
fix disjointness checking for negative integer cases #785
tests for switch for #785