- Refactored Service tier tests