Fix clock-related failing tests