Added services and tests