Fix: cyclic dependency between util-common/test