Index: /collective.imstransport/trunk/collective/imstransport/tests/base.py
===================================================================
--- /collective.imstransport/trunk/collective/imstransport/tests/base.py	(revision 174)
+++ /collective.imstransport/trunk/collective/imstransport/tests/base.py	(revision 175)
@@ -37,4 +37,5 @@
     """ Test Class """
 
+
 class IMSTransportFunctionalTestCase(FunctionalTestCase, IMSTransportTestCase):
     """ Functional test class """
Index: /collective.imstransport/trunk/collective/imstransport/tests/testCC.py
===================================================================
--- /collective.imstransport/trunk/collective/imstransport/tests/testCC.py	(revision 175)
+++ /collective.imstransport/trunk/collective/imstransport/tests/testCC.py	(revision 175)
@@ -0,0 +1,59 @@
+
+from base import IMSTransportTestCase
+from collective.imstransport.utilities.imscc.ccreader import CCReader
+from unittest import TestSuite, makeSuite
+from xml.dom import minidom
+
+organizations = """<organizations>
+  <organization identifier="1000" structure="rooted-hierarchy">
+    <item identifier="1001">
+      <item identifier="1002" identifierref="2000" />
+      <item identifier="1003" identifierref="2001" />
+    </item>
+  </organization>
+</organizations>
+"""
+
+resources = """<resources>
+  <resource identifier="2000" href="test.html" type="webcontent" />
+</resources>
+"""
+
+class TestCCReader(IMSTransportTestCase):
+    """
+    """
+
+    def testOrganizations(self):
+        """ Test organization handling """
+        ccr = CCReader()
+        ccr.document = minidom.parseString(organizations)
+        ccr.readOrganizations()
+        assert(ccr.orgdata)
+        self.assertEqual(ccr.orgdata['2001'], 3) 
+
+    def testResources(self):
+        """ Test resource handling """
+        ccr = CCReader()
+        ccr.document = minidom.parseString(resources)
+        resids = ccr.readResources()
+        assert(resids)
+        self.assertEqual(resids, ['2000'])
+
+    def testGetTextValue(self):
+        """ Test removal of text from node """
+        document = minidom.parseString("<test>Hello</test>")
+        textnode = document.getElementsByTagName('test')[0]
+        ccr = CCReader()
+        self.assertEqual(ccr.getTextValue(textnode), 'Hello')
+
+
+class TestCCWriter(IMSTransportTestCase):
+    """
+    """
+
+
+                
+def test_suite():
+    suite = TestSuite()
+    suite.addTest(makeSuite(TestCCReader))
+    return suite
Index: /collective.imstransport/trunk/collective/imstransport/utilities/imscc/ccreader.py
===================================================================
--- /collective.imstransport/trunk/collective/imstransport/utilities/imscc/ccreader.py	(revision 174)
+++ /collective.imstransport/trunk/collective/imstransport/utilities/imscc/ccreader.py	(revision 175)
@@ -3,8 +3,7 @@
 class CCReader(object):
 
-    def __init__(self, context, source):
+    def __init__(self):
         """
         """
-        self.context = context
         self.document = None
         self.orgdata = {}
@@ -17,24 +16,14 @@
         self.document = minidom.parseString(manifest)
 
-
-    def readManifests(self):
+    def readOrganizations(self):
         """ Read the organizations section of the manifest. """
         self.org = {}
         organizations = self.document.getElementsByTagName('organizations')
         if organizations:
-            self._readItems(self.context, organizations[0])
-        else:
-            raise ManifestError, 'Manifest file has no "organizations" section.'
-    
-    def readOrganizations(self):
-        """ Read the organizations section of the manifest. """
-        self.org = {}
-        organizations = self.document.getElementsByTagName('manifest')
-        if organizations:
-            return self._readItems(self.context, organizations[0])
+            return self._readItems(organizations[0])
         else:
             raise ManifestError, 'Manifest file has no "organizations" section.'
 
-    def _readItems(self, object, orgs):
+    def _readItems(self, orgs):
         """ Read items from the manifest. """