Previously, if the test failed, we would not remove the file. Change-Id: Icaa3f2894feab48279073ddb19e8586f0528763b