branches/david-xml_only_config_system (refs #519): Update unit tests