Force output of progress printer

Also clean up code for tests.