Updated tests to use service components.