Clear out EPU-layer data in ZK setup step

And add tests