Adapt to renaming
Regenerated tests