Simplify linker, update linker tests