Added proper auto disposal, improved unit tests