Normalize some of the test names