some more tests + cleanup