Fix for unit tests running after the ClockWrapperTest