Test Service refactored