Fix some test failures from sloppy linking