refacto test service
refacto test