Second fix for mailchimp double opt-in

Reverting to original mapping for the double opt-in setting. Updated tests so that they were doing the correct things. 

@amillet89 @calvinfo