Somewhat speculative fix for failure to discard non-runnable tests