used mock for zitem default
cleaned up hierarchy and tests