Further investigation in integration failures

In the spirit of #275 I want to try some things to improve test reliability. Do not merge.