MULE-7468 Remove/migrate service based tests.

I'll update names, but we need to consider if we really want to be strict on this when a PR is very clearly a refactor.  I don't disagree with that the code is cleaner with the variable names updated.  I'm just unsure that it's worth the time for both commit/reviewer, especially if it is a large refactor.