Make some changes in ServiceImplTest