Move tests into project