some cleanups for console tests