Fix test failures due to id changes in forms.