#6 renaming default implementation of StopWatch to Timer. Fixing up tests.