Removed dependence on ZenTest