Fix a broken test by supplying the DataKind for structured name

Additionally cleaned up the EntityModifierTests a bit

Bug:4081093

Change-Id: I72006e9b5752633785b7c0cc833e1fff263b7b31
1 file changed