Updating the tests to account for rm on failure