Added EmbeddedObject but have not updated tests.