Add test for stopwatch reset. Also address other comments from patch review.