Fix flaky tests

[zluudg]

Some itests hang indefinately when run as a suite. On their own, they pass. They are skipped for now, but they ought to be fixed.