Adapt test to new evolution