Split CancellationCrossVersionSpec up into two classes - one for the 2.1 specific behaviour and one for the general >=2.1 behaviour.
Fixed broken int test