FIX: test 516 desaster cleanup routine