Improving context keeping
Replacing  property by
Refactoring of modification object properties changes check
Adding error passing test