Christo Lolov

Tagging @cadonna, @dplavcic and @mdedetrich for visibility.

Thank you for the review @dplavcic. I think I have addressed your latest comments.

There were stubbings which were no longer on the call path so I have removed them. The way I checked that I wasn't changing the test behaviour was to use...

I am aware that there are merge conflicts and I will aim to address them over the coming days.

@guozhangwang and @cadonna for visibility

Hey @guozhangwang and thank you for the insightful comments! I will aim to give explanations and amend the PR in the upcoming days.

Looks great to me!

Politely bumping for a review @cadonna

Hello @cadonna and @ijuma! Tagging you for visibility.

Also @mdedetrich since you volunteered a pair of eyes for reviews :)