Added some more proper-disposal tests