Refactored dumper to fix some issues with standard primary keys.  Update tests to include a standard primary key test.