fixed ZC unit tests