Adapt tests to renaming changes