Lokesh, Manjyot|Service Test refactoring