Modified test output logging. Fixed broken tests. SetWatch in clock should not need to call track time.... In fact that could have been really bad. Will need to test