more tests, destructor update