treeset, new tests and a little mess included