FALCON-288 - implemented entity changes with tests