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