tests reorg + cleanup