Tests + fixes scoping issue for embeds many field