Merge "Fix linker tests"