Refactor pluggable service and tests for improved readability and consistency