Hanging issue

Tests that wer run in parallel were hanging before results output. This (should) fix that.