More polished time functions; time tests