Merge "Fix test scripts to account for new linker behavior"