Improve create and update process
Fix unit tests CRUDController
Merge pull request #2226 from pokap/improve_create_update

Improve create and update process