added some fixes to test_basic_multisubnet