MRG Pickle tests

I picked up #1669 from @FedericoV and just made some small changes to adjust for what I changed in master.

Should be good now.
Ping @GaelVaroquaux