Reverted ZC, more tests