Improve cleanup of test disk accountant

This addresses Clint's comments on
I9534c206bbb2e20a2bc44eba5317d136ed422957.

Change-Id: I937becdbe1a95cd8c5b028b0e7854d4c4f835211
1 file changed