Add systematic testing for cttz as well, and fix the bug I spotted by