Added IDisposable and removed tests so that there is no dependency on ooc-unit.