Fixing up tests, and altering Disposal