Rename and refactor tests to use common service logic
2 files changed