Eliminate / replace remaining cPickle references in test scripts.