Update tests.
Fix PrettyPrint.
Update gold files.