Fix for possible unit test failure for ClockWrapper (not relevant to current merge request, but was found in the pre-merge build)