[US-2]
Add tests for service layer