Minor changes to TestMessengerService.