test_dump fixes. squash me
add to f3a8121: Fix Location constructors
squash into de8ac6b: Draft modulestore refactoring