Add service and test