Simplify dump and restore test case - works with Python 3.x now.