Point taken :-)

It was intended as part of the merge, because we need the tests to clean up after themselves properly when running against a live server.  It it would have been better as a separate PR.