Fix more Py3 tests due to CatchOutput change.