Rewrote pickle tests for SdA.