Hanging issue

Tests were hanging at the end (before results output). This (should) fix that.