More logging in the testing script.

Change-Id: I79fc36b1c780250eb6d0343947a0186561ff5721
Make cleanup optional via an env var.

Change-Id: Ifcaecd22f6d57cd844ed33423ec01035ee9ca490