Added services and unit test classes