Topology functional tests bugs correction