Updated tests after entity patches