Move tests into their own dir
Update service tests