Some changes to clock testing to make it a little easier to deal with.