actually dispose stuff
dispose stuff in tests as well