Changed testing format up a bit, added the timer to the service locator.