fix tests + cleanup