refactor: take out mock object. add GetNewMock function instead