Add check for test_topo to allow flagging
Change name of test_topo function
Merge branch 'test-topo-fix' into src-instability