refactor both mappings
undo model for mapping
fix test for persist new on UoW