Topology changes test improvement

Слиты nikitronn запросил слияние topology_test_improvement в master

Created by: Durman

Addressed problem description

#3522 (closed)