Removed need for time stubs to make testing more reliable