Fix bugs for stopwatch / no-test-line