ZONG-36: tests running, but still buggy