move tests into right folder