Fix obvious testsuite regressions. Still seeing hanging runnable programs