Better terminal interface in test/run

Review 1552 by @larkost