Fix the broken tests post merge.