Merge "BUG-5006: rework SouthboundProviderTest, clean up"