Update testsuite for renaming