Fix affected tests to previous attachment fixes.