Improve ZK mock and update tests