fixed ZC unit tests
fixed reorg unit tests