Added services and test cases