Unified printing, added more test data output to TIMES