Existing tests fail to clean up after themselves

[silkentrance]

this does not include #210

problem here is that on successful assertExists, there will be no cleanup, the cleanup is done in the catch, which will never occur.