Merge to XFA: track formhandles in embeddder test class itself