test updates that went with last patch: re-ordering indirect symbols