Merge "Added initial tests for dumpstate."