Add both test name and docstring to pickle.
Fix indentation.
Add info on test cases to the XML output.