- fix updating
- fix entity getter error and refaktoring
- add new tests