Refactor.
Fix test.
Refactor: use services to retrieve information.
Improving tests.
Rename service and create test.
Just learning...