New test and example file for clock

Ok, I tried to squash all of this, and I think I successfully did (see 77fce4a), but something is amuck b/c the other commits are still present