Fixed test cases to link properly again