[Entity] Fix map pre persist
Update CHANGELOG
[Tests] Fix code coverage
Update CHANGELOG