Added timeprovider for better test functionality