NEXUS-5472: Smaller adjustments for async update

Now as update is async, some WL but also non-WL UTs needed
smaller changes to make all run smoothly.