Add a test to check that we can remove a Descriptor from within the OnCl...

...ose

handler, even if delete_on_close is set to true.