(Automated Tests) Sync with Toolkit changes