PrettyPrinter:
	- fixed remaining failing tests
PrettyPrinter:
	- new failing tests
	- small refractorings