Remove historical baggage from test names