Moving the test scripts out of the way.
saving data
Minor formatting / commenting.
Account for post-CSP bulk response shift.