Convert more, fix test/test_pickle.py