Move tests into relevant dir