Debugged testing and added timing