Fix dump.py -m
More thorough testing.