ROO-3341: Bad entity changes after field is added - Fixed problems

test included