Comment 5 for bug 1647204

Looking at the testing work Jose did a couple of weeks ago (and doesn't seem to have come back to yet), his testing changes consolidate to effectively the attached diff.

I am unsure if such changes are acceptable for a package upload, or if they are only acceptable as diagnostic/troubleshooting changes.