Reformat some output
Add pretty printer test driver