More adjustments to link order for unit tests.