testChannelAccess/testServer: more stable shutdown

testApp/remote/testServer.cpp

@@ -2617,9 +2617,16 @@ void testServer(int timeToRun)
     unregisterChannelProviderFactory(factory);
 
     structureChangedListeners.clear();
-    structureStore.clear();
-
+    {
+       Lock guard(structureStoreMutex);
+       structureStore.clear();
+    }
     ctx.reset();
+
+    unregisterChannelProviderFactory(factory);
+
+
+    shutdownSimADCs();
 }
 
 void testServerShutdown()
@@ -2690,8 +2697,6 @@ int main(int argc, char *argv[])
 
     testServer(timeToRun);
 
-    shutdownSimADCs();
-
     cout << "Done" << endl;
 
     if (cleanupAndReport)