Added retry on remove when blocked by toplevel with not-yet-removed child tests