Adapt autogen for SFd tests