MOB-1878: Fix unit tests for service