More work on TopologyMaintenanceSessionImplTest