Fix tests due to the previous change 6216f29fc55a1