Refactored Service and Test components