1.  Extended unit tests to include new CIM schema;  2.  Updated decoder xml utilities.