Tweak async fetch operation
Update Tests