Update dump structure and begin passing some tests