Added fix for some broken tests. Turns out there's a bug in the XSD
parser we're using with EntityResolvers...