test fixes
changes in handling diff on collections of entities