Finish target tests
Refactored services