Fixed tests + cleanup