Fix embeds_one handling and updated spec