Made it somewhat configurable which tests would actually print anything
Output better XML
Merge remote-tracking branch 'origin/master'