account for natural clock lag, improve clock tests