Updated tests and Task To handle 0 for time taken