Move tests into /core