Add new waits into clock tests.