test-service refactor