Added service with tests