refactoring DataTransformer service + tests fixed