Make some integration tests more robust.