Rebuilt clock()

Test programming is running again - isolated errors will be easier to
track/fix.