Fix up some broken tests in JUnit 4 conversion
try to fix so terminal tests get run under JUnit 4.