METAGEN-91 Making sure that field annotated with @EmbeddedId gets added as singular attribute

Updating tests