Confirmed fix

I'm stil working through these.

Note that I think there is an error in Catalog005.

Cases "typeswitch-117" and "typeswitch-118" now refer to two environments, which trigger a failure at:

        for $tc in $xq-testcases [concat(/*/@name, '~', fots:environment/@ref) = $nsenvs or fots:environment[fots:namespace]]

I've just seen the comment

  <xs:choice minOccurs="0" maxOccurs="unbounded">
                  <xs:element ref="environment"/> <!-- must only appear once -->
                  <xs:element ref="module"/>
                  <xs:element ref="dependency"/>
                </xs:choice>  

so I'll fix this up.