Tweaks to test reporting
Tweaks to test reporting