move tests into right packages