Test fixes on RecipientLookupService