Fix more tests. Only ZkClientSpec is now left to fix.