Tweak test names
Add pretty-printing