extend tuple tests to cover recent C code simplifications
extend test