fixes for multisubnet test