Move stopwatch to use method names instead of class names for tests, this will allow better granularity in running tests.