Topology performance test related updates