Fix for #1850

This reverts the `_closable_objects` issue (#1850) and fixes the test suite appropriately.