break out find by id functionality to service
factor out find functionality into service, improve tests