added timing test, refactored tests