Test cleanup

Several tests that would fail often were the results of race conditions
on waiting for routes between clusters to be totally formed and flushed
end to end. This fixes that and a few other common failing tests.