Added a time metric for our testing case
Refactored some duplicated code