Changed object names to pre-2.2 format. Added a workaround for the unicode NULL character problem in cdc_datatypes.
Added tests from develop. The test results need to be modified for 2.0.