Completed CF Unit Tests.  Added datafiles needed for tests.
Bug fixes found during unit tests