Adding clock and event handler tests back in