Added services and e2e tests