Updates to reflect how ZK actually works.  The perils of mocking.