Added stopwatch, tests