[reorg] move tests