Guard against multiple recycles and add testcase