Update for new test naming.