Move the input switch out of clockdrive.
Update testcounter.  Remove obsolete file.