Revert "Fix problem with order in which fields are pickled"

This reverts commit 3c39b9491080bd5bb23ba846a0a3af91ddeace20.
Simplify graph tests
Remove brittle manual generics test