Update for new test names.