More ZK proxy tests and fixes