Fixes to multisubnet test for working with new SC builder