Tweaks to fix the premature test launching issues