Move tests into /tests dir