Fixes for the TestRingSetup case.