Merge "Fix start info clock tests" into main