Match EntityId and Serializer changes so the tests apss once again

Change-Id: I0906681c164619da3f179e386168ffe3cab9ecd4