WaitForToplogyChange() caused race condition in tests

WaitForToplogyChange() in a test should wait for topology change that actually changes something and not "dummy" change that sets up topology id