refactor for istance mock timestamp usage