All:refact the mock utils