t6036: prefer test_when_finished to manual cleanup in following test