Fixed test that failed due to the merge